From 6ddc519c06db2457d3e1a331b155e18fc153f3ab Mon Sep 17 00:00:00 2001 From: rurban Date: Fri, 7 Jan 2005 13:48:50 +0000 Subject: [PATCH] store the old 1.2.4 release into cvs, under the release-1_2-branch git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/branches/release-1_2_4@4358 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- CREDITS | 2 + INSTALL | 6 +- admin/dumpserial.php | 2 +- admin/loadserial.php | 2 +- admin/lockpage.php | 2 +- admin/shrinkdbm.pl | 2 +- admin/wiki_dumpHTML.php | 2 +- admin/wiki_port1_0.php | 2 +- admin/wiki_rebuilddbms.php | 2 +- admin/zip.php | 2 +- lib/config.php | 18 +- lib/dbalib.php | 282 +++++++++++++++++++++++-- lib/pageinfo.php | 4 +- lib/savepage.php | 4 +- lib/stdlib.php | 92 +------- lib/ziplib.php | 15 +- locale/de/LC_MESSAGES/phpwiki.mo | Bin 5545 -> 5640 bytes locale/de/LC_MESSAGES/phpwiki.php | 14 +- locale/de/templates/browse.html | 4 +- locale/es/LC_MESSAGES/phpwiki.mo | Bin 6423 -> 6519 bytes locale/es/LC_MESSAGES/phpwiki.php | 14 +- locale/es/templates/browse.html | 99 +++------ locale/it/LC_MESSAGES/phpwiki.mo | Bin 6093 -> 6172 bytes locale/it/LC_MESSAGES/phpwiki.php | 12 +- locale/it/templates/browse.html | 4 +- locale/nl/LC_MESSAGES/phpwiki.mo | Bin 6098 -> 6165 bytes locale/nl/LC_MESSAGES/phpwiki.php | 14 +- locale/nl/templates/browse.html | 4 +- locale/po/de.po | 139 +++++------- locale/po/es.po | 146 +++++-------- locale/po/it.po | 134 +++++------- locale/po/nl.po | 139 +++++------- locale/po/phpwiki.pot | 128 ++++------- locale/po/sv.po | 163 ++++++-------- locale/sv/LC_MESSAGES/phpwiki.mo | Bin 6273 -> 5942 bytes locale/sv/LC_MESSAGES/phpwiki.php | 42 ++-- locale/sv/pgsrc/Framsida | 1 - locale/sv/pgsrc/MerOmMekanismerna | 2 +- locale/sv/pgsrc/PhpWikiAdministration | 4 +- locale/sv/pgsrc/Textformateringsregler | 6 +- locale/sv/pgsrc/WikiWikiWeb | 2 +- locale/sv/templates/editpage.html | 6 +- pgsrc/ReleaseNotes | 135 ++++++------ templates/browse.html | 4 +- 44 files changed, 743 insertions(+), 912 deletions(-) diff --git a/CREDITS b/CREDITS index a97dd3b30..c2227090c 100644 --- a/CREDITS +++ b/CREDITS @@ -19,6 +19,8 @@ Please report bugs to mailto:phpwiki-talk@lists.sourceforge.net ;[ Aredridel Niothke | mailto:aredridel@nbtsc.org ] : ;: has started a flat file database for Phpwiki. +;[ Reini Urban | http://phpwiki.sf.net/phpwiki/ReiniUrban ] : +;: dba work since 1.2.2. Did the 1.2.3 and 1.2.4 releases ! Localization diff --git a/INSTALL b/INSTALL index 3e3a9fc76..71c5e632d 100644 --- a/INSTALL +++ b/INSTALL @@ -26,7 +26,7 @@ http://www.foo.com/phpwiki/ If you get a blank page, PhpWiki tried to open the wrong DBM file type, most likely. Edit the file lib/config.php and set DBM_FILE_TYPE -to the correct type for your system. 'gdbm' or 'db2' usually work. +to the correct type for your system. 'gdbm' or 'db3' usually work. 1. CONFIGURATION @@ -88,8 +88,8 @@ the latest build of PHP4. It's tested under the following systems: MySQL + Debian mSQL + Red Hat 4.1 DBM or Postgresql on Red Hat 6.2 - -It reportedly works on Windows with Apache+PHP, which amazes me. +Win2000 + MySQL and dba + Apache 1.3.26 + + PHP: 4.0.6, 4.1.2, 4.2.1, 4.3.2, 4.3.5, 4.3.7 That should be all. Send patches, bugs etc. to: diff --git a/admin/dumpserial.php b/admin/dumpserial.php index b98cfbfed..60c6269f3 100755 --- a/admin/dumpserial.php +++ b/admin/dumpserial.php @@ -1,4 +1,4 @@ - + + + + \n"; diff --git a/admin/wiki_port1_0.php b/admin/wiki_port1_0.php index 61249fc5d..30b04635c 100755 --- a/admin/wiki_port1_0.php +++ b/admin/wiki_port1_0.php @@ -1,4 +1,4 @@ - + diff --git a/admin/wiki_rebuilddbms.php b/admin/wiki_rebuilddbms.php index 00d2856cc..b835ca513 100755 --- a/admin/wiki_rebuilddbms.php +++ b/admin/wiki_rebuilddbms.php @@ -1,4 +1,4 @@ - + \n"; diff --git a/admin/zip.php b/admin/zip.php index 4a985d0eb..2e1f8179b 100755 --- a/admin/zip.php +++ b/admin/zip.php @@ -1,4 +1,4 @@ -\n"; }; } - rcs_id('$Id: config.php,v 1.24.2.13 2002-02-08 15:46:30 dairiki Exp $'); + rcs_id('$Id: config.php,v 1.24.2.13.2.1 2005-01-07 13:48:42 rurban Exp $'); // end essential internal stuff @@ -174,10 +174,6 @@ // If this is left blank (or unset), the signature will be omitted. $SignatureImg = "images/signature.png"; - // this turns on url indicator icons, inserted before embedded links - //define("USE_LINK_ICONS", 1); - //define("DATA_PATH", "/wiki"); - // date & time formats used to display modification times, etc. // formats are given as format strings to PHP date() function $datetimeformat = "F j, Y"; // may contain time of day @@ -195,20 +191,16 @@ // allowed protocols for links - be careful not to allow "javascript:" // within a named link [name|uri] one more protocol is defined: phpwiki - $AllowedProtocols = "http|https|mailto|ftp|news|nntp|gopher"; + $AllowedProtocols = "http|https|mailto|ftp|news|gopher"; // URLs ending with the following extension should be inlined as images $InlineImages = "png|jpg|gif"; - // Uncomment this to automatically split WikiWords by inserting spaces. - // The default is to leave WordsSmashedTogetherLikeSo in the body text. - //define("autosplit_wikiwords", 1); - // Perl regexp for WikiNames // (? "430") { + //PHP 4.3.x Windows lock bug workaround: + // http://bugs.php.net/bug.php?id=23975 + if (substr(PHP_OS,0,3) == 'WIN') { + $mode .= "-"; // suppress locking, or + } elseif (DBM_FILE_TYPE != 'gdbm') { // gdbm does it internally + $mode .= "d"; // else use internal locking + } + } + $timeout = 0; while (list($key, $file) = each($WikiDB)) { - while (($dbi[$key] = @dba_open($file, "c", DBM_FILE_TYPE)) < 1) { - $numattempts++; - if ($numattempts > MAX_DBM_ATTEMPTS) { + while (($dbi[$key] = @dba_open($file, $mode, DBM_FILE_TYPE)) < 1) { + if (file_exists($file)) + $mode = "w"; + $secs = 0.5 + ((double)rand(1,32767)/32767); + sleep($secs); + $timeout += $secs; + if ($timeout > MAX_DBM_ATTEMPTS) { ExitWiki("Cannot open database '$key' : '$file', giving up."); } - sleep(1); } } return $dbi; @@ -53,7 +68,7 @@ function CloseDataBase($dbi) { reset($dbi); - while (list($dbmfile, $dbihandle) = each($dbi)) { + while (list($dbafile, $dbihandle) = each($dbi)) { dba_close($dbihandle); } return; @@ -94,11 +109,17 @@ // Either insert or replace a key/value (a page) - function InsertPage($dbi, $pagename, $pagehash) { + function InsertPage($dbi, $pagename, $pagehash, $pagestore='wiki') { + + if ($pagestore == 'wiki') { // a bit of a hack + $linklist = ExtractWikiPageLinks($pagehash['content']); + SetWikiPageLinks($dbi, $pagename, $linklist); + } + $pagedata = PadSerializedData(serialize($pagehash)); - if (!dba_insert($pagename, $pagedata, $dbi['wiki'])) { - if (!dba_replace($pagename, $pagedata, $dbi['wiki'])) { + if (!dba_insert($pagename, $pagedata, $dbi[$pagestore])) { + if (!dba_replace($pagename, $pagedata, $dbi[$pagestore])) { ExitWiki("Error inserting page '$pagename'"); } } @@ -128,6 +149,37 @@ return dba_exists($pagename, $dbi['archive']); } + function RemovePage($dbi, $pagename) { + + dba_delete($pagename, $dbi['wiki']); // report error if this fails? + dba_delete($pagename, $dbi['archive']); // no error if this fails + dba_delete($pagename, $dbi['hitcount']); // no error if this fails + + $linkinfo = RetrievePage($dbi, $pagename, 'wikilinks'); + + // remove page from fromlinks of pages it had links to + if (is_array($linkinfo)) { // page exists? + $tolinks = $linkinfo['tolinks']; + reset($tolinks); + while (list($tolink, $dummy) = each($tolinks)) { + $tolinkinfo = RetrievePage($dbi, $tolink, 'wikilinks'); + if (is_array($tolinkinfo)) { // page found? + $oldFromlinks = $tolinkinfo['fromlinks']; + $tolinkinfo['fromlinks'] = array(); // erase fromlinks + reset($oldFromlinks); + while (list($fromlink, $dummy) = each($oldFromlinks)) { + if ($fromlink != $pagename) // not to be erased? + $tolinkinfo['fromlinks'][$fromlink] = 1; // put link back + } // put link info back in DBM file + InsertPage($dbi, $tolink, $tolinkinfo, 'wikilinks'); + } + } + + // remove page itself + dba_delete($pagename, $dbi['wikilinks']); + } + } + // setup for title-search function InitTitleSearch($dbi, $search) { @@ -137,6 +189,7 @@ return $pos; } + // iterating through database function TitleSearchNextMatch($dbi, &$pos) { while ($pos['key']) { @@ -150,11 +203,13 @@ return 0; } + // setup for full-text search function InitFullSearch($dbi, $search) { return InitTitleSearch($dbi, $search); } + //iterating through database function FullSearchNextMatch($dbi, &$pos) { while ($pos['key']) { @@ -173,6 +228,7 @@ return 0; } + //////////////////////// // new database features @@ -180,7 +236,10 @@ function MakeBackLinkSearchRegexp($pagename) { global $WikiNameRegexp; - $quoted_pagename = preg_quote($pagename, '/'); + // Note that in (at least some) PHP 3.x's, preg_quote only takes + // (at most) one argument. Also it doesn't quote '/'s. + // It does quote '='s, so we'll use that for the delimeter. + $quoted_pagename = preg_quote($pagename); if (preg_match("/^$WikiNameRegexp\$/", $pagename)) { // FIXME: This may need modification for non-standard (non-english) $WikiNameRegexp. return "/(? (int) $score); + $lowest = $score; while ($pagename = dba_nextkey($dbi['hitcount'])) { - $res[$pagename] = dba_fetch($pagename, $dbi['hitcount']); - //echo "got $pagename with value " . $res[$pagename] . "
\n"; + $score = dba_fetch($pagename, $dbi['hitcount']); + if (count($res) < $limit) { // room left in $res? + if ($score < $lowest) + $lowest = $score; + $res[$pagename] = (int) $score; // add page to $res + } elseif ($score > $lowest) { + $oldres = $res; // save old result + $res = array(); + $removed = 0; // nothing removed yet + $newlowest = $score; // new lowest score + $res[$pagename] = (int) $score; // add page to $res + reset($oldres); + while(list($pname, $pscore) = each($oldres)) { + if (!$removed and ($pscore = $lowest)) + $removed = 1; // don't copy this entry + else { + $res[$pname] = (int) $pscore; + if ($pscore < $newlowest) + $newlowest = $pscore; + } + } + $lowest = $newlowest; + } } - arsort($res); + arsort($res); // sort + reset($res); + return($res); } @@ -307,4 +398,165 @@ return $namelist; } + //////////////////////////////////////////// + // functionality for the wikilinks DBA file + + // format of the 'wikilinks' DBA file : + // pagename => + // { tolinks => ( pagename => 1}, fromlinks => { pagename => 1 } } + + // takes a page name, returns array of scored incoming and outgoing links + function GetWikiPageLinks($dbi, $pagename) { + + $linkinfo = RetrievePage($dbi, $pagename, 'wikilinks'); + if (is_array($linkinfo)) { // page exists? + $tolinks = $linkinfo['tolinks']; // outgoing links + $fromlinks = $linkinfo['fromlinks']; // incoming links + } else { // new page, but pages may already point to it + // create info for page + $tolinks = array(); + $fromlinks = array(); + // look up pages that link to $pagename + $pname = dba_firstkey($dbi['wikilinks']); + while ($pname != false) { + $linkinfo = RetrievePage($dbi, $pname, 'wikilinks'); + if ($linkinfo['tolinks'][$pagename]) // $pname links to $pagename? + $fromlinks[$pname] = 1; + $pname = dba_nextkey($dbi['wikilinks']); + } + } + + // get and sort the outgoing links + $outlinks = array(); + reset($tolinks); // look up scores for tolinks + while(list($tolink, $dummy) = each($tolinks)) { + $toPage = RetrievePage($dbi, $tolink, 'wikilinks'); + if (is_array($toPage)) // link to internal page? + $outlinks[$tolink] = count($toPage['fromlinks']); + } + arsort($outlinks); // sort on score + $links['out'] = array(); + reset($outlinks); // convert to right format + while(list($link, $score) = each($outlinks)) + $links['out'][] = array($link, $score); + + // get and sort the incoming links + $inlinks = array(); + reset($fromlinks); // look up scores for fromlinks + while(list($fromlink, $dummy) = each($fromlinks)) { + $fromPage = RetrievePage($dbi, $fromlink, 'wikilinks'); + $inlinks[$fromlink] = count($fromPage['fromlinks']); + } + arsort($inlinks); // sort on score + $links['in'] = array(); + reset($inlinks); // convert to right format + while(list($link, $score) = each($inlinks)) + $links['in'][] = array($link, $score); + + // sort all the incoming and outgoing links + $allLinks = $outlinks; // copy the outlinks + reset($inlinks); // add the inlinks + while(list($key, $value) = each($inlinks)) + $allLinks[$key] = $value; + reset($allLinks); // lookup hits + while(list($key, $value) = each($allLinks)) + $allLinks[$key] = (int) dba_fetch($key, $dbi['hitcount']); + arsort($allLinks); // sort on hits + $links['popular'] = array(); + reset($allLinks); // convert to right format + while(list($link, $hits) = each($allLinks)) + $links['popular'][] = array($link, $hits); + + return $links; + } + + // takes page name, list of links it contains + // the $linklist is an array where the keys are the page names + function SetWikiPageLinks($dbi, $pagename, $linklist) { + + $cache = array(); + + // Phase 1: fetch the relevant pairs from 'wikilinks' into $cache + // --------------------------------------------------------------- + + // first the info for $pagename + $linkinfo = RetrievePage($dbi, $pagename, 'wikilinks'); + if (is_array($linkinfo)) // page exists? + $cache[$pagename] = $linkinfo; + else { + // create info for page + $cache[$pagename] = array( 'fromlinks' => array(), + 'tolinks' => array() + ); + // look up pages that link to $pagename + $pname = dba_firstkey($dbi['wikilinks']); + while ($pname) { + $linkinfo = RetrievePage($dbi, $pname, 'wikilinks'); + if ($linkinfo['tolinks'][$pagename]) + $cache[$pagename]['fromlinks'][$pname] = 1; + $pname = dba_nextkey($dbi['wikilinks']); + } + } + + // then the info for the pages that $pagename used to point to + $oldTolinks = $cache[$pagename]['tolinks']; + reset($oldTolinks); + while (list($link, $dummy) = each($oldTolinks)) { + $linkinfo = RetrievePage($dbi, $link, 'wikilinks'); + if (is_array($linkinfo)) + $cache[$link] = $linkinfo; + } + + // finally the info for the pages that $pagename will point to + reset($linklist); + while (list($link, $dummy) = each($linklist)) { + $linkinfo = RetrievePage($dbi, $link, 'wikilinks'); + if (is_array($linkinfo)) + $cache[$link] = $linkinfo; + } + + // Phase 2: delete the old links + // --------------------------------------------------------------- + + // delete the old tolinks for $pagename + // $cache[$pagename]['tolinks'] = array(); + // (overwritten anyway in Phase 3) + + // remove $pagename from the fromlinks of pages in $oldTolinks + + reset($oldTolinks); + while (list($oldTolink, $dummy) = each($oldTolinks)) { + if ($cache[$oldTolink]) { // links to existing page? + $oldFromlinks = $cache[$oldTolink]['fromlinks']; + $cache[$oldTolink]['fromlinks'] = array(); // erase fromlinks + reset($oldFromlinks); // comp. new fr.links + while (list($fromlink, $dummy) = each($oldFromlinks)) { + if ($fromlink != $pagename) + $cache[$oldTolink]['fromlinks'][$fromlink] = 1; + } + } + } + + // Phase 3: add the new links + // --------------------------------------------------------------- + + // set the new tolinks for $pagename + $cache[$pagename]['tolinks'] = $linklist; + + // add $pagename to the fromlinks of pages in $linklist + reset($linklist); + while (list($link, $dummy) = each($linklist)) { + if ($cache[$link]) // existing page? + $cache[$link]['fromlinks'][$pagename] = 1; + } + + // Phase 4: write $cache back to 'wikilinks' + // --------------------------------------------------------------- + + reset($cache); + while (list($link,$fromAndTolinks) = each($cache)) + InsertPage($dbi, $link, $fromAndTolinks, 'wikilinks'); + + } + ?> diff --git a/lib/pageinfo.php b/lib/pageinfo.php index c22519340..43ef8a4d7 100644 --- a/lib/pageinfo.php +++ b/lib/pageinfo.php @@ -1,4 +1,4 @@ - + $key$val\n"; diff --git a/lib/savepage.php b/lib/savepage.php index 96081fe8c..f01124074 100644 --- a/lib/savepage.php +++ b/lib/savepage.php @@ -1,4 +1,4 @@ -Warning: the Wiki DB files still live in the " . "/tmp directory. Please read the INSTALL file and move " . - "the DBM file to a permanent location or risk losing " . + "the DB files to a permanent location or risk losing " . "all the pages!\n"; } diff --git a/lib/stdlib.php b/lib/stdlib.php index 53546647a..647bed0d3 100644 --- a/lib/stdlib.php +++ b/lib/stdlib.php @@ -1,10 +1,8 @@ - "0-9A-Za-z\xc0-\xd6\xd8-\xf6\xf8-\xff", - 'alpha' => "A-Za-z\xc0-\xd6\xd8-\xf6\xf8-\xff", - 'upper' => "A-Z\xc0-\xd6\xd8-\xde", - 'lower' => "a-z\xdf-\xf6\xf8-\xff" - ); - - $keys = join('|', array_keys($classes)); - - return preg_replace("/\[:($keys):]/e", '$classes["\1"]', $regexp); -} - - -/** - * Split WikiWords in page names. - * - * It has been deemed useful to split WikiWords (into "Wiki Words") - * in places like page titles. This is rumored to help search engines - * quite a bit. - * - * @param $page string The page name. - * - * @return string The split name. - */ -function split_pagename ($page) { - - if (preg_match("/\s/", $page)) - return $page; // Already split --- don't split any more. - - // FIXME: this algorithm is Anglo-centric. - static $RE; - if (!isset($RE)) { - // This mess splits between a lower-case letter followed by either an upper-case - // or a numeral; except that it wont split the prefixes 'Mc', 'De', or 'Di' off - // of their tails. - $RE[] = '/([[:lower:]])((? $val) - $RE[$key] = pcre_fix_posix_classes($val); - } - - foreach ($RE as $regexp) - $page = preg_replace($regexp, '\\1 \\2', $page); - return $page; -} - - function LinkExistingWikiWord($wikiword, $linktext='') { global $ScriptUrl; $enc_word = rawurlencode($wikiword); if(empty($linktext)) $linktext = htmlspecialchars($wikiword); - if (defined("autosplit_wikiwords")) - $linktext=split_pagename($linktext); - return "$linktext"; } @@ -120,9 +54,6 @@ function split_pagename ($page) { $enc_word = rawurlencode($wikiword); if(empty($linktext)) $linktext = htmlspecialchars($wikiword); - if (defined("autosplit_wikiwords")) - $linktext=split_pagename($linktext); - return "$linktext?"; } @@ -133,25 +64,7 @@ function split_pagename ($page) { } if(empty($linktext)) $linktext = htmlspecialchars($url); - if (!defined('USE_LINK_ICONS')) { - return "$linktext"; - } else { - //ideally the link image would be specified by a map file - //similar to the interwiki.map - $linkproto = substr($url, 0, strrpos($url, ":")); - if ($linkproto == "mailto") { - $linkimg = "/images/mailto.png"; - } elseif ($linkproto == "http") { - $linkimg = "/images/http.png"; - } elseif ($linkproto == "https") { - $linkimg = "/images/https.png"; - } elseif ($linkproto == "ftp") { - $linkimg = "/images/ftp.png"; - } else { - $linkimg = "/images/http.png"; - } - return "\""$linktext"; - } + return "$linktext"; } function LinkImage($url, $alt='[External Image]') { @@ -576,7 +489,6 @@ function split_pagename ($page) { _dotoken('SCRIPTURL', $ScriptUrl, $page); _dotoken('PAGE', htmlspecialchars($name), $page); - _dotoken('SPLIT_PAGE', htmlspecialchars(split_pagename($name)), $page); _dotoken('ALLOWEDPROTOCOLS', $AllowedProtocols, $page); _dotoken('LOGO', $logo, $page); diff --git a/lib/ziplib.php b/lib/ziplib.php index af557b751..15a4efc59 100644 --- a/lib/ziplib.php +++ b/lib/ziplib.php @@ -1,5 +1,5 @@ rawurlencode($pagename), 'author' => rawurlencode($author), @@ -538,7 +529,7 @@ function MimeifyPage ($pagehash) { $out = MimeContentTypeHeader('application', 'x-phpwiki', $params); $out .= "Content-Transfer-Encoding: quoted-printable\r\n"; $out .= "\r\n"; - + reset($content); while (list($junk, $line) = each($content)) $out .= QuotedPrintableEncode(chop($line)) . "\r\n"; diff --git a/locale/de/LC_MESSAGES/phpwiki.mo b/locale/de/LC_MESSAGES/phpwiki.mo index f2fa3afd59d777aba4fc8c8b83f7b41591a4a5c8..2c1cf5eeefae929f912f260518a7baca37a9a32c 100644 GIT binary patch delta 1374 zcmYk+OGs2v9LMp$kIAvuINHOqa%$8pCpB#eBMhhEotQJi+Jxp2*7L+AO z1Y!g(+9iY_Ll8x|h@jfFC|XDu1qnf|k^-f^zk6@d!QkabEBA#53v|0Q5$`a**J^4@fWVbsNa3= z2$r+HouqM;4~8&+GpL>a#9S<4_BsquD}sgNXKy#KK1;9QToBfW<=duum}(1a*U%E>P1EB z7HYox$Wk_m=`tFxX(%_}Q7;s+eJvD0YKcPEH1cOHOuiXAg2Z2;yUKtr$qm$tFHj49ML*w&SuCahn`3LjQg+GVt;w?$ zL-dcM=IckL;5urdQPle{@es~nD@N1H+>j3-YuG*9f*DjuKjI!NW;R`(4pc5XQ4{u} zA~AwG`C|;>6zTx;xD{21z7t)p&A*b~Mw4hdc~tH-$^T`i*U@6S3ksh$vXQD>YqJ&9 zYO3x;Jyk_FUJ=@%j#qRbUGzF?#2rgpmD_Og-#}Ymtt_fe^|xfxP*=v*5k&1;OdEH7e`l_T`OoK`%iMF$|9{S%2i-5bf*;kf6{C$1 z`-y)Mvvar^HQR??yr_>U`suKL0qf~c<4#<{Teytn7~5gih0$u@8Tv9;jy)F6{(<#xtl16Qm(qQ3;HqTQDA=pG9)BS=8?WR3)Bb z9rN2qE>2<|$FPB?_u>^)Deqth-VJ??1N6Tl)wc37%8WIb#CFs~8B~QXqQ;v+rm*|i zjLR5kC2zUV1K&{-6;OMdA{|vGjdOS!t8oL{@e2;3R;lNP@CaT*hOoytgU?XoB>3_% zg<5c?g8J)+6XA`ks6D@pTH!s^ieI5JSVL{mCPwiup27ki!r{u|bC+?7{sQu`KYVrK z7OG;+OrkTAxUdEo2=@)_#Q+(5D|E4Gq|cuJovhGN|XT z<5^t73CyD^-BD9abS&WFFgGSqrCh{Oe2+RbTc|zM=o+vVRe>}r<4fq{JSu@zR7JO& zp5frT#!%Kv949zBHbev*V)s635!ypFWfUXQ>V&NU2MF!2Dx&`il5tg0MwF)OhhE$O diff --git a/locale/de/LC_MESSAGES/phpwiki.php b/locale/de/LC_MESSAGES/phpwiki.php index 6f03af800..7a2fb0c7c 100644 --- a/locale/de/LC_MESSAGES/phpwiki.php +++ b/locale/de/LC_MESSAGES/phpwiki.php @@ -66,24 +66,18 @@ $locale["Error message: %s"] = "Fehlermeldung: %s"; $locale["Cannot open database %s, giving up."] = "Kann Datenbank %s nicht öffnen - Abbruch."; -$locale["Insert/update to table 'wiki' failed: %s"] = +$locale["Insert/update failed: %s"] = "Einfügen/Verändern fehlgeschlagen: %s"; $locale["Delete on %s failed: %s"] = "Löschen in %s fehlgeschlagen: %s"; $locale["Insert into %s failed: %s"] = "Einfügen in %s fehlgeschlagen: %s"; -$locale["Insert/update into table 'archive' failed: %s"] = - "Einfügen/Verändern fehlgeschlagen: %s"; -$locale["MSSQL error: %s"] = - "MySQL Fehler: %s"; -$locale["Insert/Update failed: %s
\n"] = - "Einfügen/Verändern fehlgeschlagen: %s"; -$locale["Cannot delete '%s' from table '%s'"] = - "Kann nicht '%s' aus Tabelle '%s' löschen"; $locale["MySQL error: %s"] = "MySQL Fehler: %s"; $locale["Error writing page '%s'"] = "Fehler beim Schreiben der Seite '%s'"; +$locale["Cannot delete '%s' from table '%s'"] = + "Kann nicht '%s' aus Tabelle '%s' löschen"; $locale["Enter a page name"] = "Seitenname eingeben"; $locale["Go"] = @@ -130,6 +124,8 @@ $locale["WikiFatalError"] = "FatalerWikiFehler"; $locale["Search"] = "Suche"; +$locale["Nesting depth exceeded in SetHTMLOutputMode"] = + "Interner Fehler: Stackgrenze in SetHTMLOutputMode überschritten."; $locale["%d best incoming links:"] = "Die %d besten hereinkommenden Links:"; $locale["%d best outgoing links:"] = diff --git a/locale/de/templates/browse.html b/locale/de/templates/browse.html index 14b9068fb..88942b8d8 100644 --- a/locale/de/templates/browse.html +++ b/locale/de/templates/browse.html @@ -1,12 +1,12 @@ -###SPLIT_PAGE### +###PAGE###

[phpwiki] -###SPLIT_PAGE###

+###PAGE### ###IF:ADMIN### ###IF LOCK###[Seite freigeben] ###IF !LOCK###[Seite sperren] diff --git a/locale/es/LC_MESSAGES/phpwiki.mo b/locale/es/LC_MESSAGES/phpwiki.mo index f16b4a439e4dedba18e2539d11aa3d2da7806e51..a530a4305cc27f59b34c48ad97e845920cabc9d1 100644 GIT binary patch delta 1487 zcmYk+Sx8h-9LMp0ZZlfu)}m={nObh;R%up~Rs@!X_8=`Z=oHdwE>RQ%(LzW>L_|bb zJyj2(4MF%2*iZyLN%PtULG%zrL?MRt{avr*Vb1-Wd${MG^Z%c7=Vs;a%HaFdm>WiE zq-Ig8qs-c|ImT=u4#iIS8W(f_(Y>EU5BCe=%uZl7&c$n(jCU~~hp`GHxCFfnD#TJu zFbi5MjW#;=VIqbw2}e;27{e6&inDRTz4v&h`ZG|^m0&zJVmfX^E%*Qulby$Uyo4DT z#&qVlcQlsL@e37s7H`o4`cV;FM3P|-u@WDnp8tdlF%MycF&Q;+#Pu6$qBvHqz;aOm zlyk|(I*em}Yp0=s`%x)6h1!Zcs27Z26Gm_&X3Qb&xCa$^50>Kq>OCXw{ae(QL^1m^ zOmVHp8twxaWE<@^jWoQ6^YJO_MQ>0Od`3<92MNm3c&j4FMy0p`HNkGw!Y`mQcpq=! z6V&^f=~O@gEXH6G`QJg~0Ug?#an~A75W!kEw&GdT!p2Yw`GT5o67}L@4v5Z(kBhdf z73X0;7U2N$Y71dGhOrcXq>z8kljWqEt;ZtNfP+|zSFsvj;Srobe%3|08t@Ei{0MHs z7p`7r*Mhg>ckD!EY8RdA?{U2xq(Klih&*FMs1?3Mz8L$7EY>E_hlzxri7lv19OAMQ z&tVHjP#Gv--xy+BP~-NZwrmjV@HuMU;5ZEpNFa|}u?*MXNz?*{QQzw`%)t++=l^0J z=Ch%>*o0bW0QFy@vFoVH&PwXcq6{j_lmus=YiN~S?~cg~YHE(HbIwB35#=TV=0#6C0v3xuofR-6f;Y&ru1y!T?TUF@DXTXY=}ta`#oEpWmYx!gf@`y~vy_g*)*a zF2gj|Gro<}(Tu;N2JYf5%KRi!1iOe4yo~iYhTLjX_y(s@1CBBsnL!Qk5jCMKDseA| zl^8&ZU@aJ8d~2hl(j-w!kV3s+0QcZ1CU6#)VzeYT67~f(gE>@bD;PxsL{N#JKvnPp4&qhR z`|7x;3B_%1LL9VYjaY$Q zxDNY}SKBpg#(UU=Z;|a|KLXT0PUjC7^gu_@Yzv;jvp9tOnV&MXV;J?|aomf2d52Mn z&fqM1$U+sGLtQWDAR9Q4v&B(~CLKD;>@;dq+(L4(A>4(}uo}OiDp1U!8*A|}rcg7_ zAh*~w>bc*jrHZqTJMa{0;6c>=BX|IvaXQ=SR8dbQ(2e>&kK!ubfO_BouEy6`gP%}| zdRf>6>RDAt)oCN>orfTc!`rouF)YvurcN6KK1\n"] = - "Inserción/Actualización falló: %s"; -$locale["Cannot delete '%s' from table '%s'"] = - "No se puede borrar '%s' de la tabla '%s'"; $locale["MySQL error: %s"] = "Error de MySQL: %s"; $locale["Error writing page '%s'"] = "Error al escribir la página `%s'"; +$locale["Cannot delete '%s' from table '%s'"] = + "No se puede borrar '%s' de la tabla '%s'"; $locale["Enter a page name"] = "Escriba un nombre de página"; $locale["Go"] = @@ -136,6 +130,8 @@ $locale["WikiFatalError"] = "ErrorFatalDeWiki"; $locale["Search"] = "Buscar"; +$locale["Nesting depth exceeded in SetHTMLOutputMode"] = + "Límites de la pila excedidos en SetHTMLOutputMode"; $locale["%d best incoming links:"] = "%d mejores enlaces de entrada:"; $locale["%d best outgoing links:"] = diff --git a/locale/es/templates/browse.html b/locale/es/templates/browse.html index 04095bcec..eb20edc36 100644 --- a/locale/es/templates/browse.html +++ b/locale/es/templates/browse.html @@ -1,66 +1,33 @@ - - - - - - -###SPLIT_PAGE### - - - - - - - -

[phpwiki] - -###SPLIT_PAGE###

- -###IF:ADMIN### - - ###IF LOCK###[Desbloquear página] - - ###IF !LOCK###[Bloquear página] - - - - [Borrar página] - -
- -###ENDIF:ADMIN### - -

- -###CONTENT### - -

- -###IF ADMIN###EditarElTexto de esta página - -###IF:!ADMIN### - -###IF LOCK###Página bloqueada - -###IF !LOCK###EditarElTexto de esta página - -###ENDIF:!ADMIN### - -(editada por última vez ###LASTMODIFIED###) - -[info] - -[diff]) - -
- -BuscarPágina navegando o buscando - -
- -###RELATEDPAGES### - - - - - - - + + + +###PAGE### + + + +

[phpwiki] +###PAGE###

+###IF:ADMIN### + ###IF LOCK###[Desbloquear página] + ###IF !LOCK###[Bloquear página] + - - [Borrar página] +
+###ENDIF:ADMIN### +

+###CONTENT### +

+###IF ADMIN###EditarElTexto de esta página +###IF:!ADMIN### +###IF LOCK###Página bloqueada +###IF !LOCK###EditarElTexto de esta página +###ENDIF:!ADMIN### +(editada por última vez ###LASTMODIFIED###) +[info] +[diff]) +
+BuscarPágina navegando o buscando +
+###RELATEDPAGES### + + + diff --git a/locale/it/LC_MESSAGES/phpwiki.mo b/locale/it/LC_MESSAGES/phpwiki.mo index 956d2102bcb33b50efc6b62b0d2a2d8d92eda774..3657bac6fb5c084e6597d23ed46863c67fd40614 100644 GIT binary patch delta 1480 zcmYk*OGs2v9LMp$I?hb?&{0b#AE{+8A7egKv)6bWvpgF(#2?$OD@N4ODRq9%HWT3`{i;2$I?%VJh-un_aG8Fi*7QO{pRW$-Q@ z!zY-DKTzwW@?$yr)5-qYEcFo285$Fg}@nJC50c)~~iQ|R<^Lsc3^70qMR8Na~_T*6bBO&E%xA2snPQjhim z_u^|T!=I>36!Y*`Y(yPpL3X@`8c;{w8=<3}-9*-~Nvy?b)Wl1uiB_;0-JFkh-iV5{ z1GTXM?7&#!_Y%UVYb~g%Z%1ul0#!>-kv&>ug^nIfVii?o4mM&vsy6yj5s#o!K92fV zJi}s)VG({u9a#p26GZ;*wx6aT_R#*nwD6AjjWp+_ItCTD2V8j(Elt@vb>0wv#11B0 zMG02&l!qo7RpngDqfS>Psj6DNRLVPPI@lDN!l|VZO@~RC5hoVh}TO1yHodMVGO$*KKAiJQtfXX_k}OWP}s-bigt s@dPgSU+5YRMQ6Pqz5b)&q0nH@rBHadFVNN9-P1Q1?s7)aabM8=4-~V3KmY&$ delta 1435 zcmYk+OGs346vy$C&P>`vn<>j0Ek{#(*v#b2Xr<<(a#0j6EGTg^P&+pwJr;Ru5pD{S z2sefHphd1~f&@2-6V$?pTnXhSNEtzd2wS-5`@1uNf9BlJ|K6GVf1Ll(C()URGav9g zHd+T!M%3k*UB+gQ*)AOOW}U!t?!V^lmvJNaKA%}X7GV+I#clWyEAbh|FpX9C7i+ML zmp7R?c8X3n4=&(Ve1XOI2DN}G^y3_E#--f-YR zxEoVg&HOe)M?3zFn)p1UXyv^~66_Av<2|g#3FN0XkJGq-nsA)$$TVt#AE*tjq89Gu zvKReG5-f_P%x{f!l$tKo5e%RP7{=2$jvcsyJ2AE;yW_JM=01s+%F%B~?FyUs-m8$vDk zB}Q-(`PdQ{WnvBYU=4%iW4oXHt2)o{K*e$kkKhRQ;78QTLu^9>CXl+bt9T6i@G!nY zW#AkB#0=^PzwmNBE~1V&xFfruR%B@Fa_GeABvAv8pavR6z4#ur;tXnsUd~AitHf>` zM14Ptd~BJEs@y{ww175L4P8OjWTU9xy+swH^NG%JIt!?x2r;{MT#HI|6Y8&_2SYfB z6*z`Eswq@)s-jy6ZK9D_-!!p~S55E43Dp5d_-M#e;wY2UsI?OfgqrGOeLKXB)}hU6 zy_AsKbi4-$)#FL`N%o>Tt|g*`j#``532G1fi98}quvf?3D1Em^lyx=ziR;Kz4l#n7 zx1&Tev4POP0%bZusF6Rno#3iO{%^`QIdaRSE%#8R#(}yg\n"] = - "Inserimento/aggiornamento fallito: %s"; -$locale["Cannot delete '%s' from table '%s'"] = - "Non posso cancellare '%s' dalla tabella '%s'"; $locale["MySQL error: %s"] = "Errore di MySQL: %s"; $locale["Error writing page '%s'"] = "Errore durante il salvataggio della pagina '%s'"; +$locale["Cannot delete '%s' from table '%s'"] = + "Non posso cancellare '%s' dalla tabella '%s'"; $locale["Enter a page name"] = "Scrivi un nome di una pagina"; $locale["Go"] = diff --git a/locale/it/templates/browse.html b/locale/it/templates/browse.html index 471f875a2..aa3603f0c 100644 --- a/locale/it/templates/browse.html +++ b/locale/it/templates/browse.html @@ -1,12 +1,12 @@ -###SPLIT_PAGE### +###PAGE###

[phpwiki] -###SPLIT_PAGE###

+###PAGE### ###IF:ADMIN### ###IF LOCK###[Sblocca la pagina] ###IF !LOCK###[Blocca la pagina] diff --git a/locale/nl/LC_MESSAGES/phpwiki.mo b/locale/nl/LC_MESSAGES/phpwiki.mo index d04848191c76d7088838cc7fb50f0cd26376d8d9..e4657893b55b75cb9da8fe6853dc76b013d249d6 100644 GIT binary patch delta 1439 zcmYk*O-PhM9LMp$xto=(*=8?hZR=~Mt-G$TX_=KE7IY~oAxUfPP#|SS7{rrdCl7%p z(Jg|d4iTh>UZ4mB>kyS)GRP!?f`tfAU9|fC)<a^YA)WU>x)DGZvXS zHcw*}FAA9DD2CC81Gol zJFdq+=x9M7VJUS*s0ka8;H(u-q?mQ!Hu^6(SUHVBoOk;H(xgl^@aV_Gs0BW_{=j1T zbJ&1|Tnx_MVwvPWL}QQ_1Y^%Ih7-tGE9JmtJu1*c=*Jjp{AJ9+0pw?Qc?572wSh@g zz+W&I=TLVbz$6MJ*H8X6aR)Dy;yx_EVLXdZQMWmtyp>@Tbq6{zf@iQ4Z=)6*$60)b z3glJRf-|T)^cVSAF6m*9R_)MG>YGs$pF|CaVHEpNfjvasi3x1M1h!)(=S9S9q?OUq6=%DE1*hN=Ts;jFBLs!w1yb+IUXU32AEDGO4| zsY;J-RVr0yLmHjrmS`srsZtG!wxtg@Os%3SZxvJ(-Hz?lUFx`nOe9M!PkpD2$=<@J zqRXQjtlOlboa#I_Q@si$Z>-(hoSGKCbUxPE+ch?{V#bpZsR~8QgOS?0XiX?mGv@dv TJ-(Lii(Ngvi^C51Z+ia&ps|8- delta 1401 zcmZA1O-NKx7{>8;^p07n*)&s`rZbvp=IG3rIysdfNx7+vA&6>`)S@6LG1^#DR*Ruc zWV5TF)kuq4jEm@lh+5dfpp1eR7E!w*B!m_P{h#Y~)8U@`JLhuee7x_ulZ(A=&&&p# zoKbqIHPm2{*+DFGxKU2~&DP)<&n&K|f7k0j!zJ`T;4pr|3fx~}R*6Tk9*405bJ&2d zaHCnqe$ZIPgCL`%u@1{|1Xth~Y5_NJCEmm3_{8f^d45E__Z^p_Q);#rD^Lq=LiT3; zn8Mvy#r$@KMk5dIpmzQeHE}JYXyt9FU<_gc51`)9BCpy5e1Q*96OOVQnZqi)kJ``_ zYT@s(7QbK#^P7*S`avlwG!axP`cVT6;Z7XIK75X=(J5O9bv16H-{P6ZPWl&+Y}h2O z!bcdw*QoivVn!kROG5*OSSE|IRy^!8>&80zH%X|R#4x_|`tztrg}7b9M$`m(&!^Z- ze+GBpA0+3N;$TE^sFL_Iw_WGKF}#huV?`ud22d-l#{i~K@9)8CJcL|!j+;W7MQvaL zwcr9qa0Zq8dDKFFqsHwH5dRG{_A&ZNJd13~K4TmHMCHDg_{FdRH)9$#(M6oYYp4aB z4=#8Mb#@*jm(6lxZ}tlnafdKz+?osxy%50!cA;{90(BNH;{fLI2+kpw?ImAY=yBBV zMsPdku?N2)AA*IMP2)AABGQLi*bpi*16OH;Y2=XuY*Xk%{a6F(g#TaItTlNLm5!~{ z==h*ho#~{-p>cx@ZrQfj@KpS?H6^f%szj@h6ZaVF=<5SrEbj8@#HoszwxL{T8~P55 zsqIw4m~pp4+ghj{YEZN-C0PmGLRH)pGZmc*9m%9RULgW*>E_O#ll#}G2ZYo;HLa*v vt0?Kp$2zKCONkUt`F9l;rc0-tig-MlNQUFFp3Yb_mMlz^zi|rVfieF-d!llF diff --git a/locale/nl/LC_MESSAGES/phpwiki.php b/locale/nl/LC_MESSAGES/phpwiki.php index ef1629a14..5064c339b 100644 --- a/locale/nl/LC_MESSAGES/phpwiki.php +++ b/locale/nl/LC_MESSAGES/phpwiki.php @@ -66,24 +66,18 @@ $locale["Error message: %s"] = "Foutboodschap: %s"; $locale["Cannot open database %s, giving up."] = "Kan data base %s niet openen, geef op."; -$locale["Insert/update to table 'wiki' failed: %s"] = +$locale["Insert/update failed: %s"] = "Insert/update gefaald: %s"; $locale["Delete on %s failed: %s"] = "Delete op %s gefaald: %s"; $locale["Insert into %s failed: %s"] = "Insert in %s gefaald: %s"; -$locale["Insert/update into table 'archive' failed: %s"] = - "Insert/update gefaald: %s"; -$locale["MSSQL error: %s"] = - "MySQL fout: %s"; -$locale["Insert/Update failed: %s
\n"] = - "Insert/update gefaald: %s"; -$locale["Cannot delete '%s' from table '%s'"] = - "Kan '%s' niet verwijderen uit tabel '%s'"; $locale["MySQL error: %s"] = "MySQL fout: %s"; $locale["Error writing page '%s'"] = "Fout bij schrijven pagina `%s'"; +$locale["Cannot delete '%s' from table '%s'"] = + "Kan '%s' niet verwijderen uit tabel '%s'"; $locale["Enter a page name"] = "Geef de naam van een pagina"; $locale["Go"] = @@ -128,6 +122,8 @@ $locale["WikiFatalError"] = "WikiFataleFout"; $locale["Search"] = "Zoek"; +$locale["Nesting depth exceeded in SetHTMLOutputMode"] = + "Stack grenzen overschreden in SetHTMLOutputMode"; $locale["%d best incoming links:"] = "%d beste inkomende koppelingen:"; $locale["%d best outgoing links:"] = diff --git a/locale/nl/templates/browse.html b/locale/nl/templates/browse.html index 46f63f8aa..27968d649 100644 --- a/locale/nl/templates/browse.html +++ b/locale/nl/templates/browse.html @@ -1,12 +1,12 @@ -###SPLIT_PAGE### +###PAGE###

[phpwiki] -###SPLIT_PAGE###

+###PAGE### ###IF:ADMIN### ###IF LOCK###[Unlock page] ###IF !LOCK###[Lock page] diff --git a/locale/po/de.po b/locale/po/de.po index 13cbfaf1d..817447138 100644 --- a/locale/po/de.po +++ b/locale/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: phpwiki 1.1.8\n" -"POT-Creation-Date: 2001-11-28 10:50-0800\n" +"POT-Creation-Date: 2001-05-21 08:27-0700\n" "PO-Revision-Date: 2000-10-31 02:23+0200\n" "Last-Translator: Arno Hollosi \n" "Language-Team: German \n" @@ -45,51 +45,26 @@ msgstr "Seite l msgid "Removed page '%s' succesfully." msgstr "Seite '%s' erfolgreich gelöscht." -#: lib/backlinks.php:11 lib/backlinks.php:19 -#, c-format -msgid "Pages which link to %s" -msgstr "" - -#: lib/backlinks.php:32 -#, c-format -msgid "%d pages link to %s." -msgstr "" - -#: lib/config.php:238 +#: lib/config.php:197 msgid "templates/browse.html" msgstr "locale/de/templates/browse.html" -#: lib/config.php:239 +#: lib/config.php:198 msgid "templates/editpage.html" msgstr "locale/de/templates/editpage.html" -#: lib/config.php:240 +#: lib/config.php:199 msgid "templates/editlinks.html" msgstr "locale/de/templates/editlinks.html" -#: lib/config.php:241 +#: lib/config.php:200 msgid "templates/message.html" msgstr "locale/de/templates/message.html" -#: lib/config.php:257 +#: lib/config.php:216 msgid "./pgsrc" msgstr "locale/de/pgsrc" -#: lib/db_filesystem.php:76 -#, c-format -msgid "'%s': corrupt file" -msgstr "" - -#: lib/db_filesystem.php:225 -#, c-format -msgid "%s: bad data
\n" -msgstr "" - -#: lib/db_filesystem.php:317 -#, c-format -msgid "%s: Bad filename in database
\n" -msgstr "" - #: lib/diff.php:711 #, c-format msgid "WikiDiff::apply: line count mismatch: %s != %s" @@ -162,98 +137,79 @@ msgstr "Kopie von %s" msgid "No page name passed into editpage!" msgstr "Kein Seitenname an EditierSeite übergeben!" -#: lib/editpage.php:31 lib/savepage.php:135 +#: lib/editpage.php:31 lib/savepage.php:121 msgid "This page has been locked by the administrator and cannot be edited." msgstr "" "Diese Seite wurde vom Administrator gesperrt und kann nicht editiert werden." -#: lib/editpage.php:33 lib/savepage.php:111 lib/savepage.php:136 +#: lib/editpage.php:33 lib/savepage.php:99 lib/savepage.php:122 #, fuzzy msgid "Sorry for the inconvenience." msgstr "Entschuldigung für die Unannehmlichkeiten." -#: lib/editpage.php:35 lib/savepage.php:137 +#: lib/editpage.php:35 lib/savepage.php:123 #, c-format msgid "Problem while editing %s" msgstr "Problem während dem Editieren von %s" -#: lib/fullsearch.php:10 lib/search.php:9 +#: lib/fullsearch.php:9 lib/search.php:9 #, c-format msgid "Searching for \"%s\" ....." msgstr "Suche nach \"%s\" ....." -#: lib/fullsearch.php:43 lib/search.php:26 -msgid "(You entered an empty search string)" -msgstr "" - -#: lib/fullsearch.php:47 +#: lib/fullsearch.php:41 #, c-format msgid "%d matches found in %d pages." msgstr "%d Treffer in %d Seiten." -#: lib/fullsearch.php:51 +#: lib/fullsearch.php:45 msgid "Full Text Search Results" msgstr "Volltext-Suchresultate" -#: lib/msql.php:31 lib/mssql.php:41 lib/mysql.php:38 +#: lib/msql.php:29 lib/mysql.php:36 msgid "Cannot establish connection to database, giving up." msgstr "Kann Verbindung zu Datenbank nicht aufbauen - Abbruch." -#: lib/msql.php:33 lib/msql.php:39 +#: lib/msql.php:31 lib/msql.php:37 #, c-format msgid "Error message: %s" msgstr "Fehlermeldung: %s" -#: lib/msql.php:37 lib/mssql.php:50 lib/mysql.php:44 +#: lib/msql.php:35 lib/mysql.php:42 #, c-format msgid "Cannot open database %s, giving up." msgstr "Kann Datenbank %s nicht öffnen - Abbruch." -#: lib/msql.php:212 -#, fuzzy, c-format -msgid "Insert/update to table 'wiki' failed: %s" +#: lib/msql.php:210 lib/msql.php:286 +#, c-format +msgid "Insert/update failed: %s" msgstr "Einfügen/Verändern fehlgeschlagen: %s" -#: lib/msql.php:223 lib/msql.php:300 +#: lib/msql.php:221 lib/msql.php:296 #, c-format msgid "Delete on %s failed: %s" msgstr "Löschen in %s fehlgeschlagen: %s" -#: lib/msql.php:241 lib/msql.php:316 +#: lib/msql.php:237 lib/msql.php:312 #, c-format msgid "Insert into %s failed: %s" msgstr "Einfügen in %s fehlgeschlagen: %s" -#: lib/msql.php:290 -#, fuzzy, c-format -msgid "Insert/update into table 'archive' failed: %s" -msgstr "Einfügen/Verändern fehlgeschlagen: %s" - -#: lib/mssql.php:43 lib/mssql.php:52 lib/mssql.php:197 -#, fuzzy, c-format -msgid "MSSQL error: %s" -msgstr "MySQL Fehler: %s" - -#: lib/mssql.php:158 -#, fuzzy, c-format -msgid "Insert/Update failed: %s
\n" -msgstr "Einfügen/Verändern fehlgeschlagen: %s" - -#: lib/mssql.php:195 lib/mysql.php:163 -#, c-format -msgid "Cannot delete '%s' from table '%s'" -msgstr "Kann nicht '%s' aus Tabelle '%s' löschen" - -#: lib/mysql.php:40 lib/mysql.php:46 lib/mysql.php:125 lib/mysql.php:165 +#: lib/mysql.php:38 lib/mysql.php:44 lib/mysql.php:123 lib/mysql.php:163 #, c-format msgid "MySQL error: %s" msgstr "MySQL Fehler: %s" -#: lib/mysql.php:123 +#: lib/mysql.php:121 #, c-format msgid "Error writing page '%s'" msgstr "Fehler beim Schreiben der Seite '%s'" +#: lib/mysql.php:161 +#, c-format +msgid "Cannot delete '%s' from table '%s'" +msgstr "Kann nicht '%s' aus Tabelle '%s' löschen" + #: lib/pageinfo.php:9 msgid "Enter a page name" msgstr "Seitenname eingeben" @@ -285,11 +241,11 @@ msgstr "Aktuelle Seite:" msgid "Archived version" msgstr "Archivierte Seite:" -#: lib/savepage.php:16 lib/savepage.php:86 +#: lib/savepage.php:16 lib/savepage.php:74 msgid "RecentChanges" msgstr "FrischeSeiten" -#: lib/savepage.php:97 +#: lib/savepage.php:85 msgid "" "PhpWiki is unable to save your changes, because another user edited and " "saved the page while you were editing the page too. If saving proceeded now " @@ -300,17 +256,17 @@ msgstr "" "Wenn die Seite jetzt gespeichert werden würde, dann würdendie Veränderungen " "des anderen Benützers verloren gehen." -#: lib/savepage.php:99 +#: lib/savepage.php:87 msgid "In order to recover from this situation follow these steps:" msgstr "Um diese Situation zu korrigieren folge bitte den folgenden Schritten:" -#: lib/savepage.php:101 +#: lib/savepage.php:89 msgid "Use your browser's Back button to go back to the edit page." msgstr "" "Benütze die Zurück Funktion deines Browsers um zur Editierseitezu " "gelangen." -#: lib/savepage.php:103 +#: lib/savepage.php:91 msgid "" "Copy your changes to the clipboard or to another temporary place (e.g. text " "editor)." @@ -318,7 +274,7 @@ msgstr "" "Kopiere deine Veränderungen in die Zwischenablage oder an einen " "anderentemporären Platz (z.B. einen Texteditor)" -#: lib/savepage.php:105 +#: lib/savepage.php:93 msgid "" "Reload the page. You should now see the most current version of the " "page. Your changes are no longer there." @@ -326,7 +282,7 @@ msgstr "" "Aktualisiere die Seite. Du solltest jetzt die neueste Versionder " "Seite sehen. Deine Veränderungen sind verschwunden." -#: lib/savepage.php:107 +#: lib/savepage.php:95 msgid "" "Make changes to the file again. Paste your additions from the clipboard (or " "text editor)." @@ -334,30 +290,30 @@ msgstr "" "Editiere die Seite erneut. Kopiere deine Veränderungen aus derZwischenablage " "(oder aus dem Texteditor)" -#: lib/savepage.php:109 +#: lib/savepage.php:97 msgid "Press Save again." msgstr "Drücke nochmal Speichern" -#: lib/savepage.php:115 +#: lib/savepage.php:103 #, fuzzy, c-format msgid "Problem while updating %s" msgstr "Problem während dem Editieren von %s" -#: lib/savepage.php:160 +#: lib/savepage.php:146 #, c-format msgid "Thank you for editing %s." msgstr "Danke für das Editieren von %s." -#: lib/savepage.php:190 +#: lib/savepage.php:176 msgid "Your careful attention to detail is much appreciated." msgstr "Deine besondere Aufmerksamkeit für Details wird sehr geschätzt." -#: lib/search.php:30 +#: lib/search.php:25 #, c-format msgid "%d pages match your query." msgstr "%d Seiten wurden gefunden." -#: lib/search.php:33 +#: lib/search.php:28 #, fuzzy msgid "Title Search Results" msgstr "Volltext-Suchresultate" @@ -375,21 +331,22 @@ msgstr "FatalerWikiFehler" msgid "Search" msgstr "Suche" -#: lib/stdlib.php:388 +#: lib/stdlib.php:185 +#, fuzzy +msgid "Nesting depth exceeded in SetHTMLOutputMode" +msgstr "Interner Fehler: Stackgrenze in SetHTMLOutputMode überschritten." + +#: lib/stdlib.php:381 #, c-format msgid "%d best incoming links:" msgstr "Die %d besten hereinkommenden Links:" -#: lib/stdlib.php:401 +#: lib/stdlib.php:391 #, c-format msgid "%d best outgoing links:" msgstr "Die %d besten hinausgehenden Links:" -#: lib/stdlib.php:415 +#: lib/stdlib.php:402 #, c-format msgid "%d most popular nearby:" msgstr "Die %d meistbesuchten Seiten in der Nähe:" - -#, fuzzy -#~ msgid "Nesting depth exceeded in SetHTMLOutputMode" -#~ msgstr "Interner Fehler: Stackgrenze in SetHTMLOutputMode überschritten." diff --git a/locale/po/es.po b/locale/po/es.po index 06dd391ef..6b739317a 100644 --- a/locale/po/es.po +++ b/locale/po/es.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: phpwiki 1.2.0\n" -"POT-Creation-Date: 2001-11-28 10:50-0800\n" +"POT-Creation-Date: 2001-05-21 08:27-0700\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca \n" "Language-Team: \n" @@ -62,56 +62,31 @@ msgstr "Borrar página" msgid "Removed page '%s' succesfully." msgstr "Página '%s' borrada satisfactoriamente." -#: lib/backlinks.php:11 lib/backlinks.php:19 -#, c-format -msgid "Pages which link to %s" -msgstr "" - -#: lib/backlinks.php:32 -#, c-format -msgid "%d pages link to %s." -msgstr "" - # lib/config.php:162 -#: lib/config.php:238 +#: lib/config.php:197 msgid "templates/browse.html" msgstr "locale/es/templates/browse.html" # lib/config.php:163 -#: lib/config.php:239 +#: lib/config.php:198 msgid "templates/editpage.html" msgstr "locale/es/templates/editpage.html" # lib/config.php:164 -#: lib/config.php:240 +#: lib/config.php:199 msgid "templates/editlinks.html" msgstr "locale/es/templates/editlinks.html" # lib/config.php:165 -#: lib/config.php:241 +#: lib/config.php:200 msgid "templates/message.html" msgstr "locale/es/templates/message.html" # lib/config.php:181 -#: lib/config.php:257 +#: lib/config.php:216 msgid "./pgsrc" msgstr "locale/es/pgsrc" -#: lib/db_filesystem.php:76 -#, c-format -msgid "'%s': corrupt file" -msgstr "" - -#: lib/db_filesystem.php:225 -#, c-format -msgid "%s: bad data
\n" -msgstr "" - -#: lib/db_filesystem.php:317 -#, c-format -msgid "%s: Bad filename in database
\n" -msgstr "" - # lib/diff.php:682 #: lib/diff.php:711 #, c-format @@ -201,117 +176,95 @@ msgid "No page name passed into editpage!" msgstr "No se há pasado nombre de página a editarpagina" # lib/editpage.php:31 lib/savepage.php:52 -#: lib/editpage.php:31 lib/savepage.php:135 +#: lib/editpage.php:31 lib/savepage.php:121 msgid "This page has been locked by the administrator and cannot be edited." msgstr "" "Esta página ha sido bloqueada por el administrador y no puede ser " "editada." # lib/editpage.php:33 lib/savepage.php:32 lib/savepage.php:53 -#: lib/editpage.php:33 lib/savepage.php:111 lib/savepage.php:136 +#: lib/editpage.php:33 lib/savepage.php:99 lib/savepage.php:122 msgid "Sorry for the inconvenience." msgstr "Disculpe la inconveniencia." # lib/editpage.php:35 lib/savepage.php:54 -#: lib/editpage.php:35 lib/savepage.php:137 +#: lib/editpage.php:35 lib/savepage.php:123 #, c-format msgid "Problem while editing %s" msgstr "Problema al editar %s" # lib/fullsearch.php:15 -#: lib/fullsearch.php:10 lib/search.php:9 +#: lib/fullsearch.php:9 lib/search.php:9 #, c-format msgid "Searching for \"%s\" ....." msgstr "Buscando \"%s\" ..." -#: lib/fullsearch.php:43 lib/search.php:26 -msgid "(You entered an empty search string)" -msgstr "" - # lib/fullsearch.php:45 -#: lib/fullsearch.php:47 +#: lib/fullsearch.php:41 #, c-format msgid "%d matches found in %d pages." msgstr "%d veces encontrado en %d páginas." # lib/fullsearch.php:48 -#: lib/fullsearch.php:51 +#: lib/fullsearch.php:45 msgid "Full Text Search Results" msgstr "Resultados de la búsqueda en el texto completo" # lib/msql.php:29 lib/mysql.php:36 -#: lib/msql.php:31 lib/mssql.php:41 lib/mysql.php:38 +#: lib/msql.php:29 lib/mysql.php:36 msgid "Cannot establish connection to database, giving up." msgstr "" "No se puede establecer conexión con la base de datos, me doy por " "vencido." # lib/msql.php:31 lib/msql.php:37 -#: lib/msql.php:33 lib/msql.php:39 +#: lib/msql.php:31 lib/msql.php:37 #, c-format msgid "Error message: %s" msgstr "Mensaje de error: %s" # lib/msql.php:35 lib/mysql.php:42 -#: lib/msql.php:37 lib/mssql.php:50 lib/mysql.php:44 +#: lib/msql.php:35 lib/mysql.php:42 #, c-format msgid "Cannot open database %s, giving up." msgstr "No se puede abrir la base de datos %s , me doy por vencido." # lib/msql.php:210 lib/msql.php:286 -#: lib/msql.php:212 -#, fuzzy, c-format -msgid "Insert/update to table 'wiki' failed: %s" +#: lib/msql.php:210 lib/msql.php:286 +#, c-format +msgid "Insert/update failed: %s" msgstr "Inserción/Actualización falló: %s" # lib/msql.php:221 lib/msql.php:296 -#: lib/msql.php:223 lib/msql.php:300 +#: lib/msql.php:221 lib/msql.php:296 #, c-format msgid "Delete on %s failed: %s" msgstr "Eliminación en %s falló: %s" # lib/msql.php:237 lib/msql.php:312 -#: lib/msql.php:241 lib/msql.php:316 +#: lib/msql.php:237 lib/msql.php:312 #, c-format msgid "Insert into %s failed: %s" msgstr "Inserción en %s falló: %s" -# lib/msql.php:210 lib/msql.php:286 -#: lib/msql.php:290 -#, fuzzy, c-format -msgid "Insert/update into table 'archive' failed: %s" -msgstr "Inserción/Actualización falló: %s" - # lib/mysql.php:38 lib/mysql.php:44 lib/mysql.php:118 lib/mysql.php:158 -#: lib/mssql.php:43 lib/mssql.php:52 lib/mssql.php:197 -#, fuzzy, c-format -msgid "MSSQL error: %s" -msgstr "Error de MySQL: %s" - -# lib/msql.php:210 lib/msql.php:286 -#: lib/mssql.php:158 -#, fuzzy, c-format -msgid "Insert/Update failed: %s
\n" -msgstr "Inserción/Actualización falló: %s" - -# lib/mysql.php:156 -#: lib/mssql.php:195 lib/mysql.php:163 -#, c-format -msgid "Cannot delete '%s' from table '%s'" -msgstr "No se puede borrar '%s' de la tabla '%s'" - -# lib/mysql.php:38 lib/mysql.php:44 lib/mysql.php:118 lib/mysql.php:158 -#: lib/mysql.php:40 lib/mysql.php:46 lib/mysql.php:125 lib/mysql.php:165 +#: lib/mysql.php:38 lib/mysql.php:44 lib/mysql.php:123 lib/mysql.php:163 #, c-format msgid "MySQL error: %s" msgstr "Error de MySQL: %s" # lib/mysql.php:116 -#: lib/mysql.php:123 +#: lib/mysql.php:121 #, c-format msgid "Error writing page '%s'" msgstr "Error al escribir la página `%s'" +# lib/mysql.php:156 +#: lib/mysql.php:161 +#, c-format +msgid "Cannot delete '%s' from table '%s'" +msgstr "No se puede borrar '%s' de la tabla '%s'" + # lib/pageinfo.php:9 #: lib/pageinfo.php:9 msgid "Enter a page name" @@ -349,12 +302,12 @@ msgid "Archived version" msgstr "Versión archivada:" # lib/stdlib.php:384 lib/stdlib.php:445 -#: lib/savepage.php:16 lib/savepage.php:86 +#: lib/savepage.php:16 lib/savepage.php:74 msgid "RecentChanges" msgstr "CambiosRecientes" # lib/savepage.php:18 -#: lib/savepage.php:97 +#: lib/savepage.php:85 msgid "" "PhpWiki is unable to save your changes, because another user edited and " "saved the page while you were editing the page too. If saving proceeded now " @@ -366,19 +319,19 @@ msgstr "" "anterior se podrían perder." # lib/savepage.php:20 -#: lib/savepage.php:99 +#: lib/savepage.php:87 msgid "In order to recover from this situation follow these steps:" msgstr "Para restaurar esta situación siga los siguientes pasos:" # lib/savepage.php:22 -#: lib/savepage.php:101 +#: lib/savepage.php:89 msgid "Use your browser's Back button to go back to the edit page." msgstr "" "Use el botón Atrás para retornar a la página " "editada" # lib/savepage.php:24 -#: lib/savepage.php:103 +#: lib/savepage.php:91 msgid "" "Copy your changes to the clipboard or to another temporary place (e.g. text " "editor)." @@ -387,7 +340,7 @@ msgstr "" "textos)." # lib/savepage.php:26 -#: lib/savepage.php:105 +#: lib/savepage.php:93 msgid "" "Reload the page. You should now see the most current version of the " "page. Your changes are no longer there." @@ -397,7 +350,7 @@ msgstr "" "ahí." # lib/savepage.php:28 -#: lib/savepage.php:107 +#: lib/savepage.php:95 msgid "" "Make changes to the file again. Paste your additions from the clipboard (or " "text editor)." @@ -406,34 +359,34 @@ msgstr "" "portapapeles (o del editor de textos)." # lib/savepage.php:30 -#: lib/savepage.php:109 +#: lib/savepage.php:97 msgid "Press Save again." msgstr "Pulse Guardar otra vez." # lib/savepage.php:36 -#: lib/savepage.php:115 +#: lib/savepage.php:103 #, c-format msgid "Problem while updating %s" msgstr "Problema al editar %s" # lib/savepage.php:76 -#: lib/savepage.php:160 +#: lib/savepage.php:146 #, c-format msgid "Thank you for editing %s." msgstr "Gracias por editar %s." # lib/savepage.php:106 -#: lib/savepage.php:190 +#: lib/savepage.php:176 msgid "Your careful attention to detail is much appreciated." msgstr "Se agradece una cuidadosa atención a los detalles." -#: lib/search.php:30 +#: lib/search.php:25 #, c-format msgid "%d pages match your query." msgstr "" # lib/fullsearch.php:48 -#: lib/search.php:33 +#: lib/search.php:28 #, fuzzy msgid "Title Search Results" msgstr "Resultados de la búsqueda en el texto completo" @@ -454,25 +407,26 @@ msgstr "ErrorFatalDeWiki" msgid "Search" msgstr "Buscar" +# lib/stdlib.php:330 +#: lib/stdlib.php:185 +#, fuzzy +msgid "Nesting depth exceeded in SetHTMLOutputMode" +msgstr "Límites de la pila excedidos en SetHTMLOutputMode" + # lib/stdlib.php:53 -#: lib/stdlib.php:388 +#: lib/stdlib.php:381 #, c-format msgid "%d best incoming links:" msgstr "%d mejores enlaces de entrada:" # lib/stdlib.php:63 -#: lib/stdlib.php:401 +#: lib/stdlib.php:391 #, c-format msgid "%d best outgoing links:" msgstr "%d mejores enlaces de salida:" # lib/stdlib.php:74 -#: lib/stdlib.php:415 +#: lib/stdlib.php:402 #, c-format msgid "%d most popular nearby:" msgstr "%d las más populares:" - -# lib/stdlib.php:330 -#, fuzzy -#~ msgid "Nesting depth exceeded in SetHTMLOutputMode" -#~ msgstr "Límites de la pila excedidos en SetHTMLOutputMode" diff --git a/locale/po/it.po b/locale/po/it.po index 57ea7fbc3..e043bae6b 100644 --- a/locale/po/it.po +++ b/locale/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: phpwiki 1.2.0\n" -"POT-Creation-Date: 2001-11-28 10:50-0800\n" +"POT-Creation-Date: 2001-05-21 08:27-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Marco Milanesi \n" "Language-Team: \n" @@ -45,51 +45,26 @@ msgstr "Rimuovi la pagina" msgid "Removed page '%s' succesfully." msgstr "La pagina '%s' è stata rimossa correttamente." -#: lib/backlinks.php:11 lib/backlinks.php:19 -#, c-format -msgid "Pages which link to %s" -msgstr "" - -#: lib/backlinks.php:32 -#, c-format -msgid "%d pages link to %s." -msgstr "" - -#: lib/config.php:238 +#: lib/config.php:197 msgid "templates/browse.html" msgstr "locale/it/templates/browse.html" -#: lib/config.php:239 +#: lib/config.php:198 msgid "templates/editpage.html" msgstr "locale/it/templates/editpage.html" -#: lib/config.php:240 +#: lib/config.php:199 msgid "templates/editlinks.html" msgstr "locale/it/templates/editlinks.html" -#: lib/config.php:241 +#: lib/config.php:200 msgid "templates/message.html" msgstr "locale/it/templates/message.html" -#: lib/config.php:257 +#: lib/config.php:216 msgid "./pgsrc" msgstr "locale/it/pgsrc" -#: lib/db_filesystem.php:76 -#, c-format -msgid "'%s': corrupt file" -msgstr "" - -#: lib/db_filesystem.php:225 -#, c-format -msgid "%s: bad data
\n" -msgstr "" - -#: lib/db_filesystem.php:317 -#, c-format -msgid "%s: Bad filename in database
\n" -msgstr "" - #: lib/diff.php:711 #, c-format msgid "WikiDiff::apply: line count mismatch: %s != %s" @@ -162,98 +137,79 @@ msgstr "Copia di %s" msgid "No page name passed into editpage!" msgstr "Nessuna pagina ` passata a modificapagina" -#: lib/editpage.php:31 lib/savepage.php:135 +#: lib/editpage.php:31 lib/savepage.php:121 msgid "This page has been locked by the administrator and cannot be edited." msgstr "" "Questa pagina ` stata bloccata dall'amministratore e non può " "essere modificata" -#: lib/editpage.php:33 lib/savepage.php:111 lib/savepage.php:136 +#: lib/editpage.php:33 lib/savepage.php:99 lib/savepage.php:122 msgid "Sorry for the inconvenience." msgstr "Scusa per l'inconveniente." -#: lib/editpage.php:35 lib/savepage.php:137 +#: lib/editpage.php:35 lib/savepage.php:123 #, c-format msgid "Problem while editing %s" msgstr "Si sono verificati problemi durante la modifica %s" -#: lib/fullsearch.php:10 lib/search.php:9 +#: lib/fullsearch.php:9 lib/search.php:9 #, c-format msgid "Searching for \"%s\" ....." msgstr "Sto cercando \"%s\" ....." -#: lib/fullsearch.php:43 lib/search.php:26 -msgid "(You entered an empty search string)" -msgstr "" - -#: lib/fullsearch.php:47 +#: lib/fullsearch.php:41 #, c-format msgid "%d matches found in %d pages." msgstr "Ho trovato %d occorrente in %d pagine." -#: lib/fullsearch.php:51 +#: lib/fullsearch.php:45 msgid "Full Text Search Results" msgstr "Risultati della ricerca su tutto il testo" -#: lib/msql.php:31 lib/mssql.php:41 lib/mysql.php:38 +#: lib/msql.php:29 lib/mysql.php:36 msgid "Cannot establish connection to database, giving up." msgstr "Non riesco a stabilire una connessione col database, abbandono." -#: lib/msql.php:33 lib/msql.php:39 +#: lib/msql.php:31 lib/msql.php:37 #, c-format msgid "Error message: %s" msgstr "Messaggio d'errore: %s" -#: lib/msql.php:37 lib/mssql.php:50 lib/mysql.php:44 +#: lib/msql.php:35 lib/mysql.php:42 #, c-format msgid "Cannot open database %s, giving up." msgstr "Non riesco ad aprire il database %s, abbandono." -#: lib/msql.php:212 -#, fuzzy, c-format -msgid "Insert/update to table 'wiki' failed: %s" +#: lib/msql.php:210 lib/msql.php:286 +#, c-format +msgid "Insert/update failed: %s" msgstr "Inserimento/aggiornamento fallito: %s" -#: lib/msql.php:223 lib/msql.php:300 +#: lib/msql.php:221 lib/msql.php:296 #, c-format msgid "Delete on %s failed: %s" msgstr "Cancellazione su %s fallita: %s" -#: lib/msql.php:241 lib/msql.php:316 +#: lib/msql.php:237 lib/msql.php:312 #, c-format msgid "Insert into %s failed: %s" msgstr "Inserimento in %s fallito: %s" -#: lib/msql.php:290 -#, fuzzy, c-format -msgid "Insert/update into table 'archive' failed: %s" -msgstr "Inserimento/aggiornamento fallito: %s" - -#: lib/mssql.php:43 lib/mssql.php:52 lib/mssql.php:197 -#, fuzzy, c-format -msgid "MSSQL error: %s" -msgstr "Errore di MySQL: %s" - -#: lib/mssql.php:158 -#, fuzzy, c-format -msgid "Insert/Update failed: %s
\n" -msgstr "Inserimento/aggiornamento fallito: %s" - -#: lib/mssql.php:195 lib/mysql.php:163 -#, c-format -msgid "Cannot delete '%s' from table '%s'" -msgstr "Non posso cancellare '%s' dalla tabella '%s'" - -#: lib/mysql.php:40 lib/mysql.php:46 lib/mysql.php:125 lib/mysql.php:165 +#: lib/mysql.php:38 lib/mysql.php:44 lib/mysql.php:123 lib/mysql.php:163 #, c-format msgid "MySQL error: %s" msgstr "Errore di MySQL: %s" -#: lib/mysql.php:123 +#: lib/mysql.php:121 #, c-format msgid "Error writing page '%s'" msgstr "Errore durante il salvataggio della pagina '%s'" +#: lib/mysql.php:161 +#, c-format +msgid "Cannot delete '%s' from table '%s'" +msgstr "Non posso cancellare '%s' dalla tabella '%s'" + #: lib/pageinfo.php:9 msgid "Enter a page name" msgstr "Scrivi un nome di una pagina" @@ -283,11 +239,11 @@ msgstr "Versione corrente" msgid "Archived version" msgstr "Versione archiviata" -#: lib/savepage.php:16 lib/savepage.php:86 +#: lib/savepage.php:16 lib/savepage.php:74 msgid "RecentChanges" msgstr "ModificheRecenti" -#: lib/savepage.php:97 +#: lib/savepage.php:85 msgid "" "PhpWiki is unable to save your changes, because another user edited and " "saved the page while you were editing the page too. If saving proceeded now " @@ -298,17 +254,17 @@ msgstr "" "salvataggio viene comunque fatto, i cambiamenti dell'altro utente verranno " "persi." -#: lib/savepage.php:99 +#: lib/savepage.php:87 msgid "In order to recover from this situation follow these steps:" msgstr "Per risolvere questa situazione segui questi passi:" -#: lib/savepage.php:101 +#: lib/savepage.php:89 msgid "Use your browser's Back button to go back to the edit page." msgstr "" "Usa il pulsante Precedente del tuo browser per tornarealla pagina di " "modifica" -#: lib/savepage.php:103 +#: lib/savepage.php:91 msgid "" "Copy your changes to the clipboard or to another temporary place (e.g. text " "editor)." @@ -316,14 +272,14 @@ msgstr "" "Copia le tue modifiche nella clipboard o temporaneamente in unaltro posto " "(es: un editor di testo)" -#: lib/savepage.php:105 +#: lib/savepage.php:93 msgid "" "Reload the page. You should now see the most current version of the " "page. Your changes are no longer there." msgstr "" "Aggiorna la pagina. Dovresti vedere l'ultima versione senzamodifiche" -#: lib/savepage.php:107 +#: lib/savepage.php:95 msgid "" "Make changes to the file again. Paste your additions from the clipboard (or " "text editor)." @@ -331,30 +287,30 @@ msgstr "" "Cambia ancora il file ed installa le tue modifiche dalla clipboard (o " "dall'editor di testo)" -#: lib/savepage.php:109 +#: lib/savepage.php:97 msgid "Press Save again." msgstr "Premi ancora Salva" -#: lib/savepage.php:115 +#: lib/savepage.php:103 #, c-format msgid "Problem while updating %s" msgstr "Problemi durante l'aggiornamento %s" -#: lib/savepage.php:160 +#: lib/savepage.php:146 #, c-format msgid "Thank you for editing %s." msgstr "Grazie per le modifiche! %s." -#: lib/savepage.php:190 +#: lib/savepage.php:176 msgid "Your careful attention to detail is much appreciated." msgstr "La tua cura verso il dettaglio è molto apprezzata." -#: lib/search.php:30 +#: lib/search.php:25 #, c-format msgid "%d pages match your query." msgstr "" -#: lib/search.php:33 +#: lib/search.php:28 #, fuzzy msgid "Title Search Results" msgstr "Risultati della ricerca su tutto il testo" @@ -372,17 +328,21 @@ msgstr "ErroreFataleDiWiki" msgid "Search" msgstr "Ricerca" -#: lib/stdlib.php:388 +#: lib/stdlib.php:185 +msgid "Nesting depth exceeded in SetHTMLOutputMode" +msgstr "" + +#: lib/stdlib.php:381 #, c-format msgid "%d best incoming links:" msgstr "%d migliori link in entrata:" -#: lib/stdlib.php:401 +#: lib/stdlib.php:391 #, c-format msgid "%d best outgoing links:" msgstr "%s migliori link in uscita:" -#: lib/stdlib.php:415 +#: lib/stdlib.php:402 #, c-format msgid "%d most popular nearby:" msgstr "%d più popolari:" diff --git a/locale/po/nl.po b/locale/po/nl.po index 1c6a1ddee..29db646d4 100644 --- a/locale/po/nl.po +++ b/locale/po/nl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: phpwiki 1.1.7\n" -"POT-Creation-Date: 2001-11-28 10:50-0800\n" +"POT-Creation-Date: 2001-05-21 08:27-0700\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen \n" "Language-Team: Dutch \n" @@ -51,51 +51,26 @@ msgstr "Verwijder pagina" msgid "Removed page '%s' succesfully." msgstr "Pagina '%s' verwijderd." -#: lib/backlinks.php:11 lib/backlinks.php:19 -#, c-format -msgid "Pages which link to %s" -msgstr "" - -#: lib/backlinks.php:32 -#, c-format -msgid "%d pages link to %s." -msgstr "" - -#: lib/config.php:238 +#: lib/config.php:197 msgid "templates/browse.html" msgstr "locale/nl/templates/browse.html" -#: lib/config.php:239 +#: lib/config.php:198 msgid "templates/editpage.html" msgstr "locale/nl/templates/editpage.html" -#: lib/config.php:240 +#: lib/config.php:199 msgid "templates/editlinks.html" msgstr "locale/nl/templates/editlinks.html" -#: lib/config.php:241 +#: lib/config.php:200 msgid "templates/message.html" msgstr "locale/nl/templates/message.html" -#: lib/config.php:257 +#: lib/config.php:216 msgid "./pgsrc" msgstr "locale/nl/pgsrc" -#: lib/db_filesystem.php:76 -#, c-format -msgid "'%s': corrupt file" -msgstr "" - -#: lib/db_filesystem.php:225 -#, c-format -msgid "%s: bad data
\n" -msgstr "" - -#: lib/db_filesystem.php:317 -#, c-format -msgid "%s: Bad filename in database
\n" -msgstr "" - #: lib/diff.php:711 #, c-format msgid "WikiDiff::apply: line count mismatch: %s != %s" @@ -168,97 +143,78 @@ msgstr "Kopie van %s" msgid "No page name passed into editpage!" msgstr "Geen paginanaam doorgegeven aan veranderpagina" -#: lib/editpage.php:31 lib/savepage.php:135 +#: lib/editpage.php:31 lib/savepage.php:121 msgid "This page has been locked by the administrator and cannot be edited." msgstr "" "Deze pagina is afgesloten door de beheerder en kan niet veranderd worden." -#: lib/editpage.php:33 lib/savepage.php:111 lib/savepage.php:136 +#: lib/editpage.php:33 lib/savepage.php:99 lib/savepage.php:122 msgid "Sorry for the inconvenience." msgstr "Excuses voor het ongemak." -#: lib/editpage.php:35 lib/savepage.php:137 +#: lib/editpage.php:35 lib/savepage.php:123 #, c-format msgid "Problem while editing %s" msgstr "Probleem tijdens veranderen %s" -#: lib/fullsearch.php:10 lib/search.php:9 +#: lib/fullsearch.php:9 lib/search.php:9 #, c-format msgid "Searching for \"%s\" ....." msgstr "Zoeken naar \"%s\" ..." -#: lib/fullsearch.php:43 lib/search.php:26 -msgid "(You entered an empty search string)" -msgstr "" - -#: lib/fullsearch.php:47 +#: lib/fullsearch.php:41 #, c-format msgid "%d matches found in %d pages." msgstr "%d keer gevonden in %d pagina's." -#: lib/fullsearch.php:51 +#: lib/fullsearch.php:45 msgid "Full Text Search Results" msgstr "Volledige tekst zoek resultaten" -#: lib/msql.php:31 lib/mssql.php:41 lib/mysql.php:38 +#: lib/msql.php:29 lib/mysql.php:36 msgid "Cannot establish connection to database, giving up." msgstr "Kan verbinding naar data base niet tot stand brengen, geef op." -#: lib/msql.php:33 lib/msql.php:39 +#: lib/msql.php:31 lib/msql.php:37 #, c-format msgid "Error message: %s" msgstr "Foutboodschap: %s" -#: lib/msql.php:37 lib/mssql.php:50 lib/mysql.php:44 +#: lib/msql.php:35 lib/mysql.php:42 #, c-format msgid "Cannot open database %s, giving up." msgstr "Kan data base %s niet openen, geef op." -#: lib/msql.php:212 -#, fuzzy, c-format -msgid "Insert/update to table 'wiki' failed: %s" +#: lib/msql.php:210 lib/msql.php:286 +#, c-format +msgid "Insert/update failed: %s" msgstr "Insert/update gefaald: %s" -#: lib/msql.php:223 lib/msql.php:300 +#: lib/msql.php:221 lib/msql.php:296 #, c-format msgid "Delete on %s failed: %s" msgstr "Delete op %s gefaald: %s" -#: lib/msql.php:241 lib/msql.php:316 +#: lib/msql.php:237 lib/msql.php:312 #, c-format msgid "Insert into %s failed: %s" msgstr "Insert in %s gefaald: %s" -#: lib/msql.php:290 -#, fuzzy, c-format -msgid "Insert/update into table 'archive' failed: %s" -msgstr "Insert/update gefaald: %s" - -#: lib/mssql.php:43 lib/mssql.php:52 lib/mssql.php:197 -#, fuzzy, c-format -msgid "MSSQL error: %s" -msgstr "MySQL fout: %s" - -#: lib/mssql.php:158 -#, fuzzy, c-format -msgid "Insert/Update failed: %s
\n" -msgstr "Insert/update gefaald: %s" - -#: lib/mssql.php:195 lib/mysql.php:163 -#, c-format -msgid "Cannot delete '%s' from table '%s'" -msgstr "Kan '%s' niet verwijderen uit tabel '%s'" - -#: lib/mysql.php:40 lib/mysql.php:46 lib/mysql.php:125 lib/mysql.php:165 +#: lib/mysql.php:38 lib/mysql.php:44 lib/mysql.php:123 lib/mysql.php:163 #, c-format msgid "MySQL error: %s" msgstr "MySQL fout: %s" -#: lib/mysql.php:123 +#: lib/mysql.php:121 #, c-format msgid "Error writing page '%s'" msgstr "Fout bij schrijven pagina `%s'" +#: lib/mysql.php:161 +#, c-format +msgid "Cannot delete '%s' from table '%s'" +msgstr "Kan '%s' niet verwijderen uit tabel '%s'" + #: lib/pageinfo.php:9 msgid "Enter a page name" msgstr "Geef de naam van een pagina" @@ -288,11 +244,11 @@ msgstr "Actuele versie:" msgid "Archived version" msgstr "Gearchiveerde versie:" -#: lib/savepage.php:16 lib/savepage.php:86 +#: lib/savepage.php:16 lib/savepage.php:74 msgid "RecentChanges" msgstr "RecenteVeranderingen" -#: lib/savepage.php:97 +#: lib/savepage.php:85 msgid "" "PhpWiki is unable to save your changes, because another user edited and " "saved the page while you were editing the page too. If saving proceeded now " @@ -303,17 +259,17 @@ msgstr "" "was. Als bewaren nu doorgang zou vinden, zouden de veranderingen van\n" "de vorige auteur verloren gaan." -#: lib/savepage.php:99 +#: lib/savepage.php:87 msgid "In order to recover from this situation follow these steps:" msgstr "Om uit deze benarde situatie te geraken, volg je deze stappen:" -#: lib/savepage.php:101 +#: lib/savepage.php:89 msgid "Use your browser's Back button to go back to the edit page." msgstr "" "Gebruik de Terug knop van je bladeraar om terug te gaan naar de " "verander tekst pagina." -#: lib/savepage.php:103 +#: lib/savepage.php:91 msgid "" "Copy your changes to the clipboard or to another temporary place (e.g. text " "editor)." @@ -321,7 +277,7 @@ msgstr "" "Kopiëer je veranderingen naar het klipbord of een andere tijdelijke plaats " "(bijv. een tekst editor)." -#: lib/savepage.php:105 +#: lib/savepage.php:93 msgid "" "Reload the page. You should now see the most current version of the " "page. Your changes are no longer there." @@ -329,7 +285,7 @@ msgstr "" "Reload de pagina. Je zou nu de meest recente versie van de pagina " "moeten zien. Jouw veranderingen staan er nu niet meer." -#: lib/savepage.php:107 +#: lib/savepage.php:95 msgid "" "Make changes to the file again. Paste your additions from the clipboard (or " "text editor)." @@ -337,30 +293,30 @@ msgstr "" "Breng je veranderingen aan de pagina opnieuw aan. Plak je toevoeginen van " "het klipbord (of tekst editor)." -#: lib/savepage.php:109 +#: lib/savepage.php:97 msgid "Press Save again." msgstr "Druk opnieuw op Bewaar." -#: lib/savepage.php:115 +#: lib/savepage.php:103 #, c-format msgid "Problem while updating %s" msgstr "Probleem tijdens veranderen van %s" -#: lib/savepage.php:160 +#: lib/savepage.php:146 #, c-format msgid "Thank you for editing %s." msgstr "Bedankt voor het veranderen van %s." -#: lib/savepage.php:190 +#: lib/savepage.php:176 msgid "Your careful attention to detail is much appreciated." msgstr "Je zorgvuldige aandacht voor detail wordt erg gewaardeerd." -#: lib/search.php:30 +#: lib/search.php:25 #, c-format msgid "%d pages match your query." msgstr "" -#: lib/search.php:33 +#: lib/search.php:28 #, fuzzy msgid "Title Search Results" msgstr "Volledige tekst zoek resultaten" @@ -378,21 +334,22 @@ msgstr "WikiFataleFout" msgid "Search" msgstr "Zoek" -#: lib/stdlib.php:388 +#: lib/stdlib.php:185 +#, fuzzy +msgid "Nesting depth exceeded in SetHTMLOutputMode" +msgstr "Stack grenzen overschreden in SetHTMLOutputMode" + +#: lib/stdlib.php:381 #, c-format msgid "%d best incoming links:" msgstr "%d beste inkomende koppelingen:" -#: lib/stdlib.php:401 +#: lib/stdlib.php:391 #, c-format msgid "%d best outgoing links:" msgstr "%d beste uitgaande koppelingen:" -#: lib/stdlib.php:415 +#: lib/stdlib.php:402 #, c-format msgid "%d most popular nearby:" msgstr "%d meest gevraagde in de buurt:" - -#, fuzzy -#~ msgid "Nesting depth exceeded in SetHTMLOutputMode" -#~ msgstr "Stack grenzen overschreden in SetHTMLOutputMode" diff --git a/locale/po/phpwiki.pot b/locale/po/phpwiki.pot index a8b337b1c..533dc1bdd 100644 --- a/locale/po/phpwiki.pot +++ b/locale/po/phpwiki.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-11-28 10:50-0800\n" +"POT-Creation-Date: 2001-05-21 08:27-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,51 +45,26 @@ msgstr "" msgid "Removed page '%s' succesfully." msgstr "" -#: lib/backlinks.php:11 lib/backlinks.php:19 -#, c-format -msgid "Pages which link to %s" -msgstr "" - -#: lib/backlinks.php:32 -#, c-format -msgid "%d pages link to %s." -msgstr "" - -#: lib/config.php:238 +#: lib/config.php:197 msgid "templates/browse.html" msgstr "" -#: lib/config.php:239 +#: lib/config.php:198 msgid "templates/editpage.html" msgstr "" -#: lib/config.php:240 +#: lib/config.php:199 msgid "templates/editlinks.html" msgstr "" -#: lib/config.php:241 +#: lib/config.php:200 msgid "templates/message.html" msgstr "" -#: lib/config.php:257 +#: lib/config.php:216 msgid "./pgsrc" msgstr "" -#: lib/db_filesystem.php:76 -#, c-format -msgid "'%s': corrupt file" -msgstr "" - -#: lib/db_filesystem.php:225 -#, c-format -msgid "%s: bad data
\n" -msgstr "" - -#: lib/db_filesystem.php:317 -#, c-format -msgid "%s: Bad filename in database
\n" -msgstr "" - #: lib/diff.php:711 #, c-format msgid "WikiDiff::apply: line count mismatch: %s != %s" @@ -162,96 +137,77 @@ msgstr "" msgid "No page name passed into editpage!" msgstr "" -#: lib/editpage.php:31 lib/savepage.php:135 +#: lib/editpage.php:31 lib/savepage.php:121 msgid "This page has been locked by the administrator and cannot be edited." msgstr "" -#: lib/editpage.php:33 lib/savepage.php:111 lib/savepage.php:136 +#: lib/editpage.php:33 lib/savepage.php:99 lib/savepage.php:122 msgid "Sorry for the inconvenience." msgstr "" -#: lib/editpage.php:35 lib/savepage.php:137 +#: lib/editpage.php:35 lib/savepage.php:123 #, c-format msgid "Problem while editing %s" msgstr "" -#: lib/fullsearch.php:10 lib/search.php:9 +#: lib/fullsearch.php:9 lib/search.php:9 #, c-format msgid "Searching for \"%s\" ....." msgstr "" -#: lib/fullsearch.php:43 lib/search.php:26 -msgid "(You entered an empty search string)" -msgstr "" - -#: lib/fullsearch.php:47 +#: lib/fullsearch.php:41 #, c-format msgid "%d matches found in %d pages." msgstr "" -#: lib/fullsearch.php:51 +#: lib/fullsearch.php:45 msgid "Full Text Search Results" msgstr "" -#: lib/msql.php:31 lib/mssql.php:41 lib/mysql.php:38 +#: lib/msql.php:29 lib/mysql.php:36 msgid "Cannot establish connection to database, giving up." msgstr "" -#: lib/msql.php:33 lib/msql.php:39 +#: lib/msql.php:31 lib/msql.php:37 #, c-format msgid "Error message: %s" msgstr "" -#: lib/msql.php:37 lib/mssql.php:50 lib/mysql.php:44 +#: lib/msql.php:35 lib/mysql.php:42 #, c-format msgid "Cannot open database %s, giving up." msgstr "" -#: lib/msql.php:212 +#: lib/msql.php:210 lib/msql.php:286 #, c-format -msgid "Insert/update to table 'wiki' failed: %s" +msgid "Insert/update failed: %s" msgstr "" -#: lib/msql.php:223 lib/msql.php:300 +#: lib/msql.php:221 lib/msql.php:296 #, c-format msgid "Delete on %s failed: %s" msgstr "" -#: lib/msql.php:241 lib/msql.php:316 +#: lib/msql.php:237 lib/msql.php:312 #, c-format msgid "Insert into %s failed: %s" msgstr "" -#: lib/msql.php:290 -#, c-format -msgid "Insert/update into table 'archive' failed: %s" -msgstr "" - -#: lib/mssql.php:43 lib/mssql.php:52 lib/mssql.php:197 +#: lib/mysql.php:38 lib/mysql.php:44 lib/mysql.php:123 lib/mysql.php:163 #, c-format -msgid "MSSQL error: %s" +msgid "MySQL error: %s" msgstr "" -#: lib/mssql.php:158 +#: lib/mysql.php:121 #, c-format -msgid "Insert/Update failed: %s
\n" +msgid "Error writing page '%s'" msgstr "" -#: lib/mssql.php:195 lib/mysql.php:163 +#: lib/mysql.php:161 #, c-format msgid "Cannot delete '%s' from table '%s'" msgstr "" -#: lib/mysql.php:40 lib/mysql.php:46 lib/mysql.php:125 lib/mysql.php:165 -#, c-format -msgid "MySQL error: %s" -msgstr "" - -#: lib/mysql.php:123 -#, c-format -msgid "Error writing page '%s'" -msgstr "" - #: lib/pageinfo.php:9 msgid "Enter a page name" msgstr "" @@ -281,67 +237,67 @@ msgstr "" msgid "Archived version" msgstr "" -#: lib/savepage.php:16 lib/savepage.php:86 +#: lib/savepage.php:16 lib/savepage.php:74 msgid "RecentChanges" msgstr "" -#: lib/savepage.php:97 +#: lib/savepage.php:85 msgid "" "PhpWiki is unable to save your changes, because another user edited and " "saved the page while you were editing the page too. If saving proceeded now " "changes from the previous author would be lost." msgstr "" -#: lib/savepage.php:99 +#: lib/savepage.php:87 msgid "In order to recover from this situation follow these steps:" msgstr "" -#: lib/savepage.php:101 +#: lib/savepage.php:89 msgid "Use your browser's Back button to go back to the edit page." msgstr "" -#: lib/savepage.php:103 +#: lib/savepage.php:91 msgid "" "Copy your changes to the clipboard or to another temporary place (e.g. text " "editor)." msgstr "" -#: lib/savepage.php:105 +#: lib/savepage.php:93 msgid "" "Reload the page. You should now see the most current version of the " "page. Your changes are no longer there." msgstr "" -#: lib/savepage.php:107 +#: lib/savepage.php:95 msgid "" "Make changes to the file again. Paste your additions from the clipboard (or " "text editor)." msgstr "" -#: lib/savepage.php:109 +#: lib/savepage.php:97 msgid "Press Save again." msgstr "" -#: lib/savepage.php:115 +#: lib/savepage.php:103 #, c-format msgid "Problem while updating %s" msgstr "" -#: lib/savepage.php:160 +#: lib/savepage.php:146 #, c-format msgid "Thank you for editing %s." msgstr "" -#: lib/savepage.php:190 +#: lib/savepage.php:176 msgid "Your careful attention to detail is much appreciated." msgstr "" -#: lib/search.php:30 +#: lib/search.php:25 #, c-format msgid "%d pages match your query." msgstr "" -#: lib/search.php:33 +#: lib/search.php:28 msgid "Title Search Results" msgstr "" @@ -358,17 +314,21 @@ msgstr "" msgid "Search" msgstr "" -#: lib/stdlib.php:388 +#: lib/stdlib.php:185 +msgid "Nesting depth exceeded in SetHTMLOutputMode" +msgstr "" + +#: lib/stdlib.php:381 #, c-format msgid "%d best incoming links:" msgstr "" -#: lib/stdlib.php:401 +#: lib/stdlib.php:391 #, c-format msgid "%d best outgoing links:" msgstr "" -#: lib/stdlib.php:415 +#: lib/stdlib.php:402 #, c-format msgid "%d most popular nearby:" msgstr "" diff --git a/locale/po/sv.po b/locale/po/sv.po index 673ff463f..4039cb0ee 100644 --- a/locale/po/sv.po +++ b/locale/po/sv.po @@ -1,13 +1,13 @@ # sv.po -- PhpWiki's Swedish language file -# Copyright (C) 2001 Free Software Foundation, Inc. +# Copyright (C) YEAR Free Software Foundation, Inc. # Jon Åslund , 2001. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: phpwiki 1.2.2\n" -"POT-Creation-Date: 2001-11-28 10:50-0800\n" -"PO-Revision-Date: 2001-11-26 01:58+0200\n" +"Project-Id-Version: phpwiki 1.1.9\n" +"POT-Creation-Date: 2001-05-21 08:27-0700\n" +"PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,7 +16,7 @@ msgstr "" #: admin.php:26 msgid "You entered an invalid login or password." -msgstr "Du har angivit ett felaktigt användarnamn eller lösenord." +msgstr "Du har angett ett otillåtet användarnamn eller lösenord." #: admin.php:47 #, c-format @@ -30,7 +30,7 @@ msgstr "Klicka %sh #: admin.php:53 msgid "Otherwise press the \"Back\" button of your browser." -msgstr "Klicka annars på backaknappen i din webbläsare." +msgstr "Annars klicka på backaknappen i din webbläsare." #: admin.php:55 msgid "Function not yet implemented." @@ -45,51 +45,26 @@ msgstr "Ta bort sida" msgid "Removed page '%s' succesfully." msgstr "Tog bort sidan \"%s\"." -#: lib/backlinks.php:11 lib/backlinks.php:19 -#, c-format -msgid "Pages which link to %s" -msgstr "Sidor som länkar till %s" - -#: lib/backlinks.php:32 -#, c-format -msgid "%d pages link to %s." -msgstr "%d sidor länkar till %s." - -#: lib/config.php:238 +#: lib/config.php:197 msgid "templates/browse.html" msgstr "locale/sv/templates/browse.html" -#: lib/config.php:239 +#: lib/config.php:198 msgid "templates/editpage.html" msgstr "locale/sv/templates/editpage.html" -#: lib/config.php:240 +#: lib/config.php:199 msgid "templates/editlinks.html" msgstr "locale/sv/templates/editlinks.html" -#: lib/config.php:241 +#: lib/config.php:200 msgid "templates/message.html" msgstr "locale/sv/templates/message.html" -#: lib/config.php:257 +#: lib/config.php:216 msgid "./pgsrc" msgstr "locale/sv/pgsrc" -#: lib/db_filesystem.php:76 -#, c-format -msgid "'%s': corrupt file" -msgstr "\"%s\": trasig fil" - -#: lib/db_filesystem.php:225 -#, c-format -msgid "%s: bad data
\n" -msgstr "%s: felaktig data
\n" - -#: lib/db_filesystem.php:317 -#, c-format -msgid "%s: Bad filename in database
\n" -msgstr "%s: felaktigt filnamn i databasen
\n" - #: lib/diff.php:711 #, c-format msgid "WikiDiff::apply: line count mismatch: %s != %s" @@ -101,7 +76,7 @@ msgstr "WikiDiff::_check: misslyckades" #: lib/diff.php:781 msgid "WikiDiff::_check: edit sequence is non-optimal" -msgstr "WikiDiff::_check: ändringssekvensen är ej optimal" +msgstr "WikiDiff::_check: ändringssekvensen är icke optimal" #: lib/diff.php:785 #, c-format @@ -162,96 +137,77 @@ msgstr "Kopia av %s" msgid "No page name passed into editpage!" msgstr "Ingen sida är angiven!" -#: lib/editpage.php:31 lib/savepage.php:135 +#: lib/editpage.php:31 lib/savepage.php:121 msgid "This page has been locked by the administrator and cannot be edited." msgstr "Den här sidan är låst av administratören och kan ej redigeras." -#: lib/editpage.php:33 lib/savepage.php:111 lib/savepage.php:136 +#: lib/editpage.php:33 lib/savepage.php:99 lib/savepage.php:122 msgid "Sorry for the inconvenience." msgstr "Ledsen för allt besvär." -#: lib/editpage.php:35 lib/savepage.php:137 +#: lib/editpage.php:35 lib/savepage.php:123 #, c-format msgid "Problem while editing %s" -msgstr "Kan ej redigera %s" +msgstr "Har problem med att redigera %s" -#: lib/fullsearch.php:10 lib/search.php:9 +#: lib/fullsearch.php:9 lib/search.php:9 #, c-format msgid "Searching for \"%s\" ....." msgstr "Söker efter \"%s\" ....." -#: lib/fullsearch.php:43 lib/search.php:26 -msgid "(You entered an empty search string)" -msgstr "(Du har angivit en tom söksträng)" - -#: lib/fullsearch.php:47 +#: lib/fullsearch.php:41 #, c-format msgid "%d matches found in %d pages." msgstr "%d träffar funna på %d sidor." -#: lib/fullsearch.php:51 +#: lib/fullsearch.php:45 msgid "Full Text Search Results" msgstr "Sökresultat för fulltextsökning" -#: lib/msql.php:31 lib/mssql.php:41 lib/mysql.php:38 +#: lib/msql.php:29 lib/mysql.php:36 msgid "Cannot establish connection to database, giving up." msgstr "Ger upp, kan ej skapa anslutning till databasen." -#: lib/msql.php:33 lib/msql.php:39 +#: lib/msql.php:31 lib/msql.php:37 #, c-format msgid "Error message: %s" msgstr "Felmeddelande: %s" -#: lib/msql.php:37 lib/mssql.php:50 lib/mysql.php:44 +#: lib/msql.php:35 lib/mysql.php:42 #, c-format msgid "Cannot open database %s, giving up." msgstr "Ger upp, kan ej öppna databasen %s." -#: lib/msql.php:212 -#, fuzzy, c-format -msgid "Insert/update to table 'wiki' failed: %s" -msgstr "Insättning/uppdatering i wikitabellen misslyckades: %s" +#: lib/msql.php:210 lib/msql.php:286 +#, c-format +msgid "Insert/update failed: %s" +msgstr "Insättning/uppdatering misslyckades: %s" -#: lib/msql.php:223 lib/msql.php:300 +#: lib/msql.php:221 lib/msql.php:296 #, c-format msgid "Delete on %s failed: %s" msgstr "Borttagning på %s misslyckades: %s" -#: lib/msql.php:241 lib/msql.php:316 +#: lib/msql.php:237 lib/msql.php:312 #, c-format msgid "Insert into %s failed: %s" msgstr "Insättning till %s misslyckades: %s" -#: lib/msql.php:290 -#, fuzzy, c-format -msgid "Insert/update into table 'archive' failed: %s" -msgstr "Insättning/uppdatering misslyckades: %s" - -#: lib/mssql.php:43 lib/mssql.php:52 lib/mssql.php:197 -#, fuzzy, c-format -msgid "MSSQL error: %s" -msgstr "MSSQL-fel: %s" - -#: lib/mssql.php:158 -#, fuzzy, c-format -msgid "Insert/Update failed: %s
\n" -msgstr "Insättning/uppdatering misslyckades: %s
\n" - -#: lib/mssql.php:195 lib/mysql.php:163 -#, c-format -msgid "Cannot delete '%s' from table '%s'" -msgstr "Kan ej ta bort \"%s\" från tabellen \"%s\"" - -#: lib/mysql.php:40 lib/mysql.php:46 lib/mysql.php:125 lib/mysql.php:165 +#: lib/mysql.php:38 lib/mysql.php:44 lib/mysql.php:123 lib/mysql.php:163 #, c-format msgid "MySQL error: %s" msgstr "MySQL-fel: %s" -#: lib/mysql.php:123 +#: lib/mysql.php:121 #, c-format msgid "Error writing page '%s'" msgstr "Kunde inte spara sidan \"%s\"" +#: lib/mysql.php:161 +#, c-format +msgid "Cannot delete '%s' from table '%s'" +msgstr "Kan ej ta bort \"%s\" från tabellen \"%s\"" + #: lib/pageinfo.php:9 msgid "Enter a page name" msgstr "Ange ett sidnamn" @@ -271,7 +227,7 @@ msgstr "Sidinformation f #: lib/pageinfo.php:36 #, c-format msgid "Page name '%s' is not in the database" -msgstr "Sidan \"%s\" finns inte i databasen" +msgstr "Sidnamnet \"%s\" finns inte i databasen" #: lib/pageinfo.php:64 msgid "Current version" @@ -281,11 +237,11 @@ msgstr "Nuvarande version" msgid "Archived version" msgstr "Arkiverad version" -#: lib/savepage.php:16 lib/savepage.php:86 +#: lib/savepage.php:16 lib/savepage.php:74 msgid "RecentChanges" msgstr "SenasteÄndringar" -#: lib/savepage.php:97 +#: lib/savepage.php:85 msgid "" "PhpWiki is unable to save your changes, because another user edited and " "saved the page while you were editing the page too. If saving proceeded now " @@ -295,17 +251,17 @@ msgstr "" "och sparade sidan under tiden som du ändrade på sidan. Sparar du nu " "försvinner ändringarna gjorda av den förra användaren." -#: lib/savepage.php:99 +#: lib/savepage.php:87 msgid "In order to recover from this situation follow these steps:" msgstr "För att lösa situtationen, följ dessa steg:" -#: lib/savepage.php:101 +#: lib/savepage.php:89 msgid "Use your browser's Back button to go back to the edit page." msgstr "" "Använd webbläsarens backaknapp för att gå tillbaka till " "redigeringssidan." -#: lib/savepage.php:103 +#: lib/savepage.php:91 msgid "" "Copy your changes to the clipboard or to another temporary place (e.g. text " "editor)." @@ -313,7 +269,7 @@ msgstr "" "Kopiera dina ändringar till urklippet eller till ett annat temporärt ställe " "(t.ex. en texteditor)." -#: lib/savepage.php:105 +#: lib/savepage.php:93 msgid "" "Reload the page. You should now see the most current version of the " "page. Your changes are no longer there." @@ -321,7 +277,7 @@ msgstr "" "Ladda om sidan. Du kommer nu se den senaste versionen av sidan. Dina " "ändringar är inte där." -#: lib/savepage.php:107 +#: lib/savepage.php:95 msgid "" "Make changes to the file again. Paste your additions from the clipboard (or " "text editor)." @@ -329,30 +285,30 @@ msgstr "" "Ändra filen igen. Klistra in dina ändringar från urklippet (eller " "texteditorn)." -#: lib/savepage.php:109 +#: lib/savepage.php:97 msgid "Press Save again." msgstr "Klicka på Spara igen." -#: lib/savepage.php:115 +#: lib/savepage.php:103 #, c-format msgid "Problem while updating %s" -msgstr "Kan ej uppdatera %s" +msgstr "Har problem med att uppdatera %s" -#: lib/savepage.php:160 +#: lib/savepage.php:146 #, c-format msgid "Thank you for editing %s." msgstr "Tack för att du redigerade %s." -#: lib/savepage.php:190 +#: lib/savepage.php:176 msgid "Your careful attention to detail is much appreciated." -msgstr "Din uppmärksamhet för detaljer är mycket uppskattad." +msgstr "Din omstänksamhet för detaljer är mycket uppskattad." -#: lib/search.php:30 +#: lib/search.php:25 #, c-format msgid "%d pages match your query." msgstr "%d sidor matchar din fråga." -#: lib/search.php:33 +#: lib/search.php:28 #, fuzzy msgid "Title Search Results" msgstr "Sökresultat för fulltextsökning" @@ -370,23 +326,22 @@ msgstr "WikiFatalError" msgid "Search" msgstr "Sök" -#: lib/stdlib.php:388 +#: lib/stdlib.php:185 +#, fuzzy +msgid "Nesting depth exceeded in SetHTMLOutputMode" +msgstr "Stackgräns överskriden i SetHTMLOutputMode" + +#: lib/stdlib.php:381 #, c-format msgid "%d best incoming links:" msgstr "De %d mest använda ingående länkarna:" -#: lib/stdlib.php:401 +#: lib/stdlib.php:391 #, c-format msgid "%d best outgoing links:" msgstr "De %d mest använda utgående länkarna:" -#: lib/stdlib.php:415 +#: lib/stdlib.php:402 #, c-format msgid "%d most popular nearby:" msgstr "De %d mest populära grannarna:" - -#~ msgid "Stack bounds exceeded in SetHTMLOutputMode" -#~ msgstr "Stackgräns överskriden i SetHTMLOutputMode" - -#~ msgid "RelatedPages" -#~ msgstr "RelateradeSidor" diff --git a/locale/sv/LC_MESSAGES/phpwiki.mo b/locale/sv/LC_MESSAGES/phpwiki.mo index cd3413633a16cd7ef1e81afc8f698c8bfebb8241..164de849d02faa46bb594115a1913c6dd42d83ba 100644 GIT binary patch delta 1672 zcmZwHTSyd99LMpa>1r4Avbv^SoV4s>nb)-Yl`Ie}C@P3x%_${!Hr5G>f~_coh#;nj z9wNFvRa6@yMD$QmLRQdAM2SQ}pwUxM5z_ZJZPY^t|MNLBo;h>Q|39;bt9vTr19@p@ z3~d!LiKt68W-B(Q8B>V2(trCDCv!fSJRiYg&O-rXGO!wBxB$oFb%vGXABn{+=%-z3!h^)zC|r$7;`Z#)0nXsLYR zGZ%0XUcw@tZwBaS;5VF(x!kP`G@ur63bliaNK(urtie9i_@BtFrj%Vg#0u1WUy^3B z+9J-UqBgb&wSjdU0zBVrqN5wOp;EIKRf=<{8+&jyzQmPSFpk~h7SxWTSc%=Jd3uuP zFHofz!C9Ea(`5tJV;JL<(VV3d#Pe8yw^0*4K|Np)^}uhaQe`u%c3zxxIV#0FaS9&A ziFg^6!3WriFOugqTvX{+W|Mzj0<)0|Rd@iEf$KOEUm}|}-%%5!^G4A%?WhU%p-OW+ zdHn`z{C(ul^l{L*H>d>-qe_*@#S+ZTCI4DLH5WAT7OcQ_)Iv_<4D3aX8^jjO$opN( z&8W=Ss7xNjd3Xesp*zT*dClPw4xvhWi*#!N{c$=LozJKhkIy%Ta+wkwg>z63s6s8I z3H_R*Qr(S9@fxnjkEqhkr;aLR3x`^?QRB~H4fZ0{F!3QeTImmLM2n}@;a1d+PNEie z8nxo9sFXj(srU&k9K)*gZdBkZm|2FpOmlxvxZtLmICG;RQy-Z4*nkHR9 z@b39y5_m6)MbLdVZROf|+%Be=h%xpqwUq<|C`m$!}`&U|&YKy2MRCm=nl~66o zsJ~P2-wmZxnc}neGgpbqn9`}#E+J9~m1{9EpHNfT)b!&M@OvCI5gGJrrgX0$)Rbx} z;{U|zM@K1F)7$MgZ*m~!T?ynRN;CRXGv@8x(-wB^#JkZmQW6u#9!m4>W(O0EIp0%5 z>zu9+uIqF-yBOq;iqZEtNJ(cx+w#t56?%b#@I&k&`2#95oMB{Y$m&z#F^b_ zKwR2~B2uup_+l%lSP-iZ8punqeNgZz7O4;VU~OqcEGQ~ops4u$?QT-_kdx2MnalZ~ z|NqP`bsz1`UaBv9)zF6Nx6z-B7~|mSGGjKOttc47t(=b*&wXs<{5WpGQ+Nk1VI6*n z^>__;;9s}_Tlp7Y7j85rYhLG|mVx)M6+gm0yo}qi@g`&1Fosq5G(LvYSdHhg23Jr4 ze~k*@H@q1)R2I$~ibhfQ?ZHasH-|WAVPFik!T?EvIf?gS4maZkjNgB-g5@C8aT%RwJ<+mC;nNqjlq7-N3k4_V*{SR zCVT_+q9xP>7f=&^hb-3ojmkhJX_7lp89svBFsvc}dci9U+=^#Wwf+?Kq90Lvqnv-* zT+PUkiQza77thb4YQBtmeg%8*S5&5=Tb}FMfL&B=kK*n45-NaqQO|#lcj6UPAl0N#*L(30KAz=(Y@2sbD_%mS zdIfjlMbyem`PO)ciJ~$V!%y&0)E;Q29=hI#JYo)@0)7J74kn4E_#A4U=dm5LISy32 zWmHWr;y(NZN3oZ?HQ_O2$ehAn`~Y?TRosOUUP8G|KdRP4crQ-lJ@__iVPByF`v%Ea z*8IeQQeMj}T4^6zJc8Op^T+h6nnB*yioavdn1 zZPWL!rpQz$HGKh!{C>J>_5bz|1NvQ1d5C?z-Bmo&zEIOXQPZcX+AC{Xkg}x(YhSf% z{sH=08|FY+P^urM^IKycr0cs@o%I8wrj+*6V|3D(|H10P68a9hYTZTGUKpfnGpeaX zmaY=?(K}TueUthP*C(Rdt7+3{L#eUHOn2`6@*tb?{G?6K+GyBqqH#OtB;3%>IO&Ng zyD*yx>@yiRSm07PUXDQ;k#xAzcY-kYa(!FG@pH@dJuQdx!G=8c-<9O9)nDB_qTEbdvg9S)z+r)= oF!W*LiIRvrojcj|T3uo4Gz%&&EjQ4-y&^L=H?tb#CYmq)0~|pdiU0rr diff --git a/locale/sv/LC_MESSAGES/phpwiki.php b/locale/sv/LC_MESSAGES/phpwiki.php index 63e187df8..3ded4a465 100644 --- a/locale/sv/LC_MESSAGES/phpwiki.php +++ b/locale/sv/LC_MESSAGES/phpwiki.php @@ -1,23 +1,19 @@ \n"] = - "%s: felaktig data
\n"; -$locale["%s: Bad filename in database
\n"] = - "%s: felaktigt filnamn i databasen
\n"; $locale["WikiDiff::apply: line count mismatch: %s != %s"] = "WikiDiff::apply: radantalet stämmer inte: %s != %s"; $locale["WikiDiff::_check: failed"] = "WikiDiff::_check: misslyckades"; $locale["WikiDiff::_check: edit sequence is non-optimal"] = - "WikiDiff::_check: ändringssekvensen är ej optimal"; + "WikiDiff::_check: ändringssekvensen är icke optimal"; $locale["WikiDiff Okay: LCS = %s"] = "WikiDiff Ok: LCS = %s"; $locale["Current page:"] = @@ -71,11 +61,9 @@ $locale["This page has been locked by the administrator and cannot be edited."] $locale["Sorry for the inconvenience."] = "Ledsen för allt besvär."; $locale["Problem while editing %s"] = - "Kan ej redigera %s"; + "Har problem med att redigera %s"; $locale["Searching for \"%s\" ....."] = "Söker efter \"%s\" ....."; -$locale["(You entered an empty search string)"] = - "(Du har angivit en tom söksträng)"; $locale["%d matches found in %d pages."] = "%d träffar funna på %d sidor."; $locale["Full Text Search Results"] = @@ -86,24 +74,18 @@ $locale["Error message: %s"] = "Felmeddelande: %s"; $locale["Cannot open database %s, giving up."] = "Ger upp, kan ej öppna databasen %s."; -$locale["Insert/update to table 'wiki' failed: %s"] = - "Insättning/uppdatering i wikitabellen misslyckades: %s"; +$locale["Insert/update failed: %s"] = + "Insättning/uppdatering misslyckades: %s"; $locale["Delete on %s failed: %s"] = "Borttagning på %s misslyckades: %s"; $locale["Insert into %s failed: %s"] = "Insättning till %s misslyckades: %s"; -$locale["Insert/update into table 'archive' failed: %s"] = - "Insättning/uppdatering misslyckades: %s"; -$locale["MSSQL error: %s"] = - "MSSQL-fel: %s"; -$locale["Insert/Update failed: %s
\n"] = - "Insättning/uppdatering misslyckades: %s
\n"; -$locale["Cannot delete '%s' from table '%s'"] = - "Kan ej ta bort \"%s\" från tabellen \"%s\""; $locale["MySQL error: %s"] = "MySQL-fel: %s"; $locale["Error writing page '%s'"] = "Kunde inte spara sidan \"%s\""; +$locale["Cannot delete '%s' from table '%s'"] = + "Kan ej ta bort \"%s\" från tabellen \"%s\""; $locale["Enter a page name"] = "Ange ett sidnamn"; $locale["Go"] = @@ -113,7 +95,7 @@ $locale["Show the page source and references"] = $locale["PageInfo"] = "Sidinformation för"; $locale["Page name '%s' is not in the database"] = - "Sidan \"%s\" finns inte i databasen"; + "Sidnamnet \"%s\" finns inte i databasen"; $locale["Current version"] = "Nuvarande version"; $locale["Archived version"] = @@ -135,11 +117,11 @@ $locale["Make changes to the file again. Paste your additions from the clipboard $locale["Press Save again."] = "Klicka på Spara igen."; $locale["Problem while updating %s"] = - "Kan ej uppdatera %s"; + "Har problem med att uppdatera %s"; $locale["Thank you for editing %s."] = "Tack för att du redigerade %s."; $locale["Your careful attention to detail is much appreciated."] = - "Din uppmärksamhet för detaljer är mycket uppskattad."; + "Din omstänksamhet för detaljer är mycket uppskattad."; $locale["%d pages match your query."] = "%d sidor matchar din fråga."; $locale["Title Search Results"] = @@ -150,6 +132,8 @@ $locale["WikiFatalError"] = "WikiFatalError"; $locale["Search"] = "Sök"; +$locale["Nesting depth exceeded in SetHTMLOutputMode"] = + "Stackgräns överskriden i SetHTMLOutputMode"; $locale["%d best incoming links:"] = "De %d mest använda ingående länkarna:"; $locale["%d best outgoing links:"] = diff --git a/locale/sv/pgsrc/Framsida b/locale/sv/pgsrc/Framsida index 1ab7ede5f..30be6a45d 100644 --- a/locale/sv/pgsrc/Framsida +++ b/locale/sv/pgsrc/Framsida @@ -5,4 +5,3 @@ * Se [SenasteÄndringar] för nya sidor och de senaste ändringarna. * Kolla vilken sida som är [MestPopulär]. * Läs ReleaseNotes (på engelska). -* Administrera den här wikin på PhpWikiAdministration. diff --git a/locale/sv/pgsrc/MerOmMekanismerna b/locale/sv/pgsrc/MerOmMekanismerna index bd2f99402..048f078de 100644 --- a/locale/sv/pgsrc/MerOmMekanismerna +++ b/locale/sv/pgsrc/MerOmMekanismerna @@ -4,7 +4,7 @@ som ASP, EmbPerl eller JSP. PhpWiki består av dussin filer med en blandning av PHP och HTML. Webbsidorna som en PHP-baserad WikiWikiWeb består av finns i en -DBM-fil med backupkopior av tidigare versioner i en annan DBM-fil. +DBM-fil med backupkopior av tidigare versioner i en andra DBM-fil. Varje gång en användare vill titta på en sida tas den från DBM-filen och rendreras. Användaren anropar bara filen index.php, som sedan diff --git a/locale/sv/pgsrc/PhpWikiAdministration b/locale/sv/pgsrc/PhpWikiAdministration index 7165cd7fd..025610e25 100644 --- a/locale/sv/pgsrc/PhpWikiAdministration +++ b/locale/sv/pgsrc/PhpWikiAdministration @@ -4,7 +4,7 @@ ! ZIP-filer av databasen - __[ZIP Snapshot | phpwiki:?zip=snapshot]__ : innehåller endast den senaste versionen + __[ZIP Snapshot | phpwiki:zip=snapshot]__ : innehåller endast den senaste versionen __[ZIP Dump | phpwiki:?zip=all]__ : innehåller alla arkiverade versioner @@ -22,7 +22,7 @@ metadata finns som parametrar till Content-Type i brevhuvudet. ! Ladda / Dumpa serialiserade sidor -Här kan du ladda eller dumpa sidor av din wiki i valfri katalog. +Här kan du ladda eller dumpa sidor av din Wiki i valfri katalog. __Dump__ diff --git a/locale/sv/pgsrc/Textformateringsregler b/locale/sv/pgsrc/Textformateringsregler index 5c6689616..38788aac3 100644 --- a/locale/sv/pgsrc/Textformateringsregler +++ b/locale/sv/pgsrc/Textformateringsregler @@ -39,8 +39,8 @@ Detta ! Markering -* Använd dubbla apostrofer ('____') för vanlig betoning (vanligtvis ''lutande stil'') -* Använd dubbla understreck (_''''_) för stark betoning (vanligtvis __fet stil__) +* Använd dubbla apostrofer ('') för vanlig betoning (vanligtvis ''lutande stil'') +* Använd dubbla understreck (__) för stark betoning (vanligtvis __fet stil__) * Blanda dem om du vill: __''fet lutande stil''__ * ''Markering'' kan användas ''flera'' gånger på en rad, men ''kan inte'' användas över radgränser: @@ -49,7 +49,7 @@ kommer inte att fungera'' ! Referenser -* Hyperlänkar till andra sidor inom wikin görs genom att sätta sidnamnet innanför hakparenteser: [detta är en länk] eller genom att [AnvändaWikiOrd] (föredras) +* Hyperlänkar till andra sidor inom Wikin görs genom att sätta sidnamnet innanför hakparenteser: [detta är en länk] eller genom att [AnvändaWikiOrd] (föredras) * Hyperlänkar till externa sidor görs så här: [http://www.wcsb.org/] * Du kan namnge länkarna genom att skriva ett namn, ett lodrätt streck och sedan hyperlänken eller sidnamnet: [PhpWiki-hemsidan | http://phpwiki.sourceforge.net/] - [framsidan | Framsida] * Du kan undvika att länkar skapas genom att sätta "!" framför ordet som du inte vill vara en länk, t.ex. !InteEnWikilänk, !http://inte.heller.en.länk/ diff --git a/locale/sv/pgsrc/WikiWikiWeb b/locale/sv/pgsrc/WikiWikiWeb index b57997356..a89f72f58 100644 --- a/locale/sv/pgsrc/WikiWikiWeb +++ b/locale/sv/pgsrc/WikiWikiWeb @@ -1,4 +1,4 @@ -En WikiWikiWeb är en webbplats där alla kan bidra till innehållet. Den mest välkända och mest använda wikin är Portland Pattern Repository på http://c2.com/cgi-bin/wiki?WikiWikiWeb. +En WikiWikiWeb är en webbplats där alla kan bidra till innehållet. Den mest välkända och mest använda Wikin är Portland Pattern Repository på http://c2.com/cgi-bin/wiki?WikiWikiWeb. Där fann jag följande relevanta uttalanden (översatta till svenska): diff --git a/locale/sv/templates/editpage.html b/locale/sv/templates/editpage.html index a535fd1ed..81d2860e1 100644 --- a/locale/sv/templates/editpage.html +++ b/locale/sv/templates/editpage.html @@ -28,17 +28,17 @@ Jag kan inte skriva tabbar.
-Markering: '' för lutande, __ för fet, ''__ för både och +Markering: '' för lutande, ''' för fet, ''''' för både och
Listor: tab-* för punktlistor, tab-# för numrerade listor, tab-term:-tab för definitionslistor
Referenser: BindIhopOrdMedStoraBokstäver eller använd hakar för en [länk] eller URL [http://cool.wiki.int/].
Referenser: Använd [1],[2],[3],... och RedigeraLänkar. Undvik länkning med "!": !SkapaEjHyperlänk, namnge länkar med [text | URL]
Blandat:"!", "!!", "!!!" skapar rubriker, -"%%%" skapar radbrytning, "----" skapar en horisontell linje, skriv "[[" för att få "[" +"%%%" skapar radbrytning, "- - - -" skapar en horisontell linje, skriv "[[" för att få "["
mer information på Textformateringsregler - + diff --git a/pgsrc/ReleaseNotes b/pgsrc/ReleaseNotes index cc0aa2bd5..f1c2709d3 100644 --- a/pgsrc/ReleaseNotes +++ b/pgsrc/ReleaseNotes @@ -1,64 +1,71 @@ -PhpWiki 1.2 is a huge advance over version 1.0: - -* Database support for MySQL, Postgresql, mSQL, flat file and the new dba_ library in PHP4 is included. -* Internationalization: support for different languages, down to the source level, is included. German, Spanish, Swedish and Dutch are currently shipped with PhpWiki. An architecture is in place to easily add more languages. -* New linking schemes using square brackets in addition to the old style !BumpyText. -* Administration features include page locking, dumping the Wiki to a zip file, and deleting pages. -* A MostPopular page showing the most frequently hit pages. -* Full HTML compliance. -* Links at the bottom of pages describing relationships like incoming links from other pages and their hits, outgoing and their hits, and the most popular nearby pages. -* Color page diffs between the current and previous version. -* An info page to view page metadata. -* Far more customization capability for the admin. -* A templating system to separate the page HTML from the PHP code. -* New markup constructs for , ,
,
and more. -* Tabless markup to supercede the older markup (both still supported). - - ----- - -PhpWiki 1.1.9 includes Spanish language pages, a full implementation for -Postgresql, numerous bug fixes and more. See the HISTORY file for more -info: http://phpwiki.sourceforge.net/phpwiki/HISTORY - ----- - -PhpWiki 1.1.6 is a major revision of PhpWiki. The ability to have themes (via an -easy-to-edit template system) has been added; the schema for MySQL has been -completely overhauled, breaking the page details into columns (for efficiency we -agreed not to put references in a separate table, so it's not completely -normalized. "Don't let the best be the enemy of the good.") - -Postgresql support has been added and the markup language is evolving, now allowing -!!!

-!!

-!

-tags and __a new way to make text bold__, and of course the -[new linking scheme]. - -There is a new feature on all pages called ''more info'' that gives you a low level -detailed view of a page, which is probably more useful for debugging than anything. - -As we move towards a 1.2 release we will be adding logging, top ten most active -pages and other new features with the new database schema (and yes, these features -will make it into the DBM version too). I also want to add mSQL support and test it -under Zend, the new PHP4. - -Below are the release notes for version 1.03, the last release of the 1.0 PhpWiki -series. --Steve Wainstead, mailto:swain@panix.com - ----- - -PhpWiki was written because I am so interested in WikiWikiWebs, and I haven't used PHP since version 2.0. I wanted to see how it had advanced. - -Version 1.0 is a near-perfect clone of the Portland Pattern Repository, http://c2.com/cgi-bin/wiki?WikiWikiWeb. In truth, I was using the Wiki script you can download from there as a model; that Wiki lacks a number of features the PPR has, like EditCopy. So in truth PhpWiki is a kind of hybrid of the PPR and the generic Wiki you can get from there (which is written in Perl). - -The one caveat of PhpWiki is the allowance of HTML if the line is preceded by a bar (or pipe, which is how I usually say it). (That's a '|'). It was very simple to add, and the idea came from a posting somewhere on the PPR about how AT&T had an internal Wiki clone and used the same technique. The ability to embed HTML is disabled by default for security reasons. - -Version 1.01 includes a patch that fixes a small error with rendering
lines. Thanks to Gerry Barksdale. - -See the HISTORY file for a rundown on the whole development process if that sort of thing really interests you :-) - ---SteveWainstead - - +PhpWiki 1.2.4 improves possible deadlocks in DBA, and fixes problems + with DBA open failures. + +PhpWiki 1.2.3 just adds the RELATEDPAGES footer support to dba, + adds remove to dba, + and fixes one minor aesthetic error on info w/o "Show the page source" + +PhpWiki 1.2 is a huge advance over version 1.0: + +* Database support for MySQL, Postgresql, mSQL, flat file and the new dba_ library in PHP4 is included. +* Internationalization: support for different languages, down to the source level, is included. German, Spanish, Swedish and Dutch are currently shipped with PhpWiki. An architecture is in place to easily add more languages. +* New linking schemes using square brackets in addition to the old style !BumpyText. +* Administration features include page locking, dumping the Wiki to a zip file, and deleting pages. +* A MostPopular page showing the most frequently hit pages. +* Full HTML compliance. +* Links at the bottom of pages describing relationships like incoming links from other pages and their hits, outgoing and their hits, and the most popular nearby pages. +* Color page diffs between the current and previous version. +* An info page to view page metadata. +* Far more customization capability for the admin. +* A templating system to separate the page HTML from the PHP code. +* New markup constructs for , ,
,
and more. +* Tabless markup to supercede the older markup (both still supported). + + +---- + +PhpWiki 1.1.9 includes Spanish language pages, a full implementation for +Postgresql, numerous bug fixes and more. See the HISTORY file for more +info: http://phpwiki.sourceforge.net/phpwiki/HISTORY + +---- + +PhpWiki 1.1.6 is a major revision of PhpWiki. The ability to have themes (via an +easy-to-edit template system) has been added; the schema for MySQL has been +completely overhauled, breaking the page details into columns (for efficiency we +agreed not to put references in a separate table, so it's not completely +normalized. "Don't let the best be the enemy of the good.") + +Postgresql support has been added and the markup language is evolving, now allowing +!!!

+!!

+!

+tags and __a new way to make text bold__, and of course the +[new linking scheme]. + +There is a new feature on all pages called ''more info'' that gives you a low level +detailed view of a page, which is probably more useful for debugging than anything. + +As we move towards a 1.2 release we will be adding logging, top ten most active +pages and other new features with the new database schema (and yes, these features +will make it into the DBM version too). I also want to add mSQL support and test it +under Zend, the new PHP4. + +Below are the release notes for version 1.03, the last release of the 1.0 PhpWiki +series. --Steve Wainstead, mailto:swain@panix.com + +---- + +PhpWiki was written because I am so interested in WikiWikiWebs, and I haven't used PHP since version 2.0. I wanted to see how it had advanced. + +Version 1.0 is a near-perfect clone of the Portland Pattern Repository, http://c2.com/cgi-bin/wiki?WikiWikiWeb. In truth, I was using the Wiki script you can download from there as a model; that Wiki lacks a number of features the PPR has, like EditCopy. So in truth PhpWiki is a kind of hybrid of the PPR and the generic Wiki you can get from there (which is written in Perl). + +The one caveat of PhpWiki is the allowance of HTML if the line is preceded by a bar (or pipe, which is how I usually say it). (That's a '|'). It was very simple to add, and the idea came from a posting somewhere on the PPR about how AT&T had an internal Wiki clone and used the same technique. The ability to embed HTML is disabled by default for security reasons. + +Version 1.01 includes a patch that fixes a small error with rendering
lines. Thanks to Gerry Barksdale. + +See the HISTORY file for a rundown on the whole development process if that sort of thing really interests you :-) + +--SteveWainstead + + diff --git a/templates/browse.html b/templates/browse.html index 93147c338..3f70c42cf 100644 --- a/templates/browse.html +++ b/templates/browse.html @@ -1,12 +1,12 @@ -###SPLIT_PAGE### +###PAGE###

[phpwiki] -###SPLIT_PAGE###

+###PAGE###

###IF:ADMIN### ###IF LOCK###[Unlock page] ###IF !LOCK###[Lock page] -- 2.45.0